Changeset 2648

Timestamp:

Oct 4, 2008, 1:48:03 AM (16 years ago)

Author:

rvelices

Message:

• fix tag cloud display with IE6/IE7 (without additionnal css hacks)
• collapsed several identical selectors into one

Location:

trunk/template/yoga

Files:

• default-layout.css (modified) (1 diff)
• fix-ie5-ie6.css (modified) (2 diffs)
• fix-khtml.css (modified) (1 diff)
• menubar.css (modified) (1 diff)
• menubar_tags.tpl (modified) (1 diff)
• picture.css (modified) (1 diff)
• tags.tpl (modified) (1 diff)
• theme/dark/theme.css (modified) (2 diffs)

trunk/template/yoga/default-layout.css

@@ -213 +213 @@
 }
 
-#fullTagCloud LI {
-        display: inline;
+#fullTagCloud SPAN {
         white-space: nowrap;
         margin: 0 2px;

trunk/template/yoga/fix-ie5-ie6.css

@@ -1 +1 @@
 /* $Id$ */
-/* Issues in IE from 5 to 6 only not to be used with IE7                      */
+/* Issues in IE from 5 to 6 only not to be used with IE7 */
 
 /* fix IE with another layout for thumbnails */
@@ -23 +23 @@
   /**/
 }
-.content UL.thumbnails INPUT {
-  position: absolute;
-  left: 2px;
-  top: 2px;  /* same as other browsers but not so pretty */
-}
-
 
 /* to avoid vanishing objects in IE6 */

trunk/template/yoga/fix-khtml.css

@@ -12 +12 @@
 }
 
-#menubar #menuTagCloud LI
+#menubar #menuTagCloud SPAN
 {
   display: inline-block;/* required for Safari 3.1 - otherwise overflows on the right */
 }
 
-/* end Safari/Konqueror */
-

trunk/template/yoga/menubar.css

@@ -83 +83 @@
 }
 
-#menubar #menuTagCloud LI
+#menubar #menuTagCloud SPAN
 {
-        display: inline;
-        white-space: nowrap;    /* No line break in the LI but Opera set nowrap to */
+        white-space: nowrap;
 }

trunk/template/yoga/menubar_tags.tpl

@@ -1 +1 @@
 <dt>{'Related tags'|@translate}</dt>
 <dd>
-        <ul id="menuTagCloud">
+        <div id="menuTagCloud">
                 {foreach from=$block->data item=tag}
-                <li>
+                <span>
                         {if !empty($tag.U_ADD) }
-                                <a href="{$tag.U_ADD}"
-                                        title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.counter)}"
-                                        rel="nofollow">
-                                        <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
-                                </a>
+                        <a href="{$tag.U_ADD}"
+                                title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.counter)}"
+                                rel="nofollow">
+                                <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
+                        </a>
                         {/if}
                         <a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See elements linked to this tag only'|@translate}">{$tag.name}</a>
-                        </li>
+                </span>
                 {/foreach}
-        </ul>
+        </div>
 </dd>
 

trunk/template/yoga/picture.css

@@ -30 +30 @@
         margin-bottom: 4px;
         padding: 0;
+        height: 28px;
 }
 
-#imageToolBar {
-        height: 28px;
-}
 #imageToolBar A, #imageToolBar IMG {
         display: block;

trunk/template/yoga/tags.tpl

@@ -2 +2 @@
 <div id="content" class="content">
 
-  <div class="titrePage">
-    <ul class="categoryActions">
-{if $display_mode == 'letters'}
-      <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"/></a></li>
-{/if}
+        <div class="titrePage">
+                <ul class="categoryActions">
+                {if $display_mode == 'letters'}
+                        <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"/></a></li>
+                {/if}
 
-{if $display_mode == 'cloud'}
-      <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"/></a></li>
-{/if}
+                {if $display_mode == 'cloud'}
+                        <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"/></a></li>
+                {/if}
 
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
-    </ul>
-    <h2>{'Tags'|@translate}</h2>
+                        <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
+                </ul>
+                <h2>{'Tags'|@translate}</h2>
   </div>
 
 {if isset($tags)}
-  {if $display_mode == 'cloud'}
-  <ul id="fullTagCloud">
-    {foreach from=$tags item=tag}
-    <li><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$tag.counter}">{$tag.name}</a></li>
-    {/foreach}
-  </ul>
-  {/if}
+        {if $display_mode == 'cloud'}
+        <div id="fullTagCloud">
+                {foreach from=$tags item=tag}
+                <span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$tag.counter}">{$tag.name}</a></span>
+                {/foreach}
+        </div>
+        {/if}
 
   {if $display_mode == 'letters'}

trunk/template/yoga/theme/dark/theme.css

@@ -36 +36 @@
         background-repeat: repeat-x;
         background-position: center;
+        border-top: 1px solid #000;
 }
 
 /* borders */
 #menubar DL, .content{
-        border: 1px solid #000000;
+        border: 1px solid #000;
 }
 
-#imageHeaderBar {
-        border-top: 1px solid #000000;
-}
 H2, #menubar DT, #imageToolBar {
-        border-bottom: 1px solid #000000;
+        border-bottom: 1px solid #000;
 }
 
@@ -71 +69 @@
 /* links */
 A, INPUT.rateButton {
-        color: #FFFFFF;
+        color: #fff;
         border: none;
 }