aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-07-01 02:09:21 +0000
committerrvelices <rv-github@modusoptimus.com>2008-07-01 02:09:21 +0000
commitd91d0ac444a08c664d05c00a8593fc88fbb0c605 (patch)
tree7f560292f25e68b67604def548d2db595228bb94 /template
parent1d3706a42171b409e9d455194ee96d3fc87479a4 (diff)
- remember me cookie security improvement (the time when the cookie was generated is saved and checked in range [now-remember_me_length; now]
- tags improvements * pass to templates all fields in table #tags (handy for plugins such as type tags) * fix issue with tag letter when first letter is accentuated (utf-8) * tags are sorted on url_name instead of name (accentuated first letter chars are the same as without accent) * better use of columns in by letter display mode git-svn-id: http://piwigo.org/svn/trunk@2409 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'template')
-rw-r--r--template/yoga/menubar.css126
-rw-r--r--template/yoga/menubar.tpl12
-rw-r--r--template/yoga/tags.tpl8
3 files changed, 72 insertions, 74 deletions
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index e676d5784..c777213c3 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -1,34 +1,32 @@
#menubar {
- float: left;
- margin: 0 0 10px 1em;
- padding: 0;
- /* Fix against the "double margin of a floated item" IE bug */
- /* Damned: that screws up top_navbar in opera 7.54/Linux! */
- display: inline;
- text-align: left; /* follow-up of the "be nice to IE5" rule */
+ float: left;
+ margin: 0 0 10px 1em;
+ padding: 0;
+ display: inline;
+ text-align: left; /* follow-up of the "be nice to IE5" rule */
}
#menubar DL, #menubar DT, #menubar DD {
- margin: 0; padding: 0; display: block;
+ margin: 0; padding: 0; display: block;
}
#menubar .button {
- margin: 0 2px;
- width: auto;
- padding: 0;
- text-indent: 0;
- list-style: none;
- text-align: center;
- float: right;
+ margin: 0 2px;
+ width: auto;
+ padding: 0;
+ text-indent: 0;
+ list-style: none;
+ text-align: center;
+ float: right;
}
/* H2 properties copied here */
#menubar DT {
- font-weight: bold; /* default for h2 */
- margin: 0;
- padding: 5px 5px 5px 5px;
- font-size: 120%;
- text-align: center;
+ font-weight: bold;
+ margin: 0;
+ padding: 5px 5px 5px 5px;
+ font-size: 120%;
+ text-align: center;
}
#menubar UL,
@@ -36,26 +34,26 @@
#menubar FORM,
#menubar P, /* ooh, careful... */
#menubar .totalImages {
- font-size: 92%;
- margin: 10px 0 10px 10px;
+ font-size: 92%;
+ margin: 10px 0 10px 10px;
}
#menubar UL {
- list-style-type: square;
- list-style-position: inside;
- padding: 0 0 0 2px;
+ list-style-type: square;
+ list-style-position: inside;
+ padding: 0 0 0 2px;
}
#menubar UL UL {
- font-size: 100%;
- margin-top: 0;
- margin-bottom: 0;
+ font-size: 100%;
+ margin-top: 0;
+ margin-bottom: 0;
}
#menubar LI.selected A {
- font-weight: bold;
+ font-weight: bold;
}
#menubar LI.selected LI A {
- font-weight: normal;
+ font-weight: normal;
}
#menubar .menuInfoCatByChild {
@@ -64,86 +62,86 @@
}
#menubar HR {
- display: block;
- margin: 10px auto;
- width: 90%;
+ display: block;
+ margin: 10px auto;
+ width: 90%;
}
#menubar INPUT {
- text-indent: 2px;
+ text-indent: 2px;
}
/* quickconnect form */
FORM#quickconnect {
- margin: 0;
- padding: 5px;
+ margin: 0;
+ padding: 5px;
}
FORM#quickconnect FIELDSET {
- margin: 0;
- padding: 0 0 0.5em 0;
+ margin: 0;
+ padding: 0 0 0.5em 0;
}
FORM#quickconnect P {
- margin-left: 0;
- font-size: 100%;
- float: left;
- clear: left;
+ margin-left: 0;
+ font-size: 100%;
+ float: left;
+ clear: left;
}
FORM#quickconnect P INPUT {
- margin: 0;
+ margin: 0;
}
FORM#quickconnect UL.actions {
- display: inline;
- float: right;
- padding: 0;
- text-align: right; /* Opera 7.5 */
+ display: inline;
+ float: right;
+ padding: 0;
+ text-align: right; /* Opera 7.5 */
}
FORM#quickconnect FIELDSET>UL.actions {
- width: 40%; /* Opera 7.5 cannot find why width:auto fails :-( */
+ width: 40%; /* Opera 7.5 cannot find why width:auto fails :-( */
}
FORM#quickconnect UL.actions,
FORM#quickconnect P,
FORM#quickconnect LABEL {
- padding: 0 0.5em 0 0.5em;
+ padding: 0 0.5em 0 0.5em;
}
FORM#quickconnect LABEL {
- margin:0;
- width: 100%;
- box-sizing: border-box; /* CSS3 */
+ margin:0;
+ width: 100%;
+ box-sizing: border-box; /* CSS3 */
}
FORM#quickconnect INPUT[type=text],
FORM#quickconnect INPUT[type=password] {
- width: 100%; /* mozilla can handle 100% */
+ width: 100%; /* mozilla can handle 100% */
}
-/* same as above for IE with inputfix.htc */
-/* unfortunately IE doesn't handle that correctly */
-/* so you should set a width in em in local_layout.css */
+/* same as above for IE with inputfix.htc
+unfortunately IE doesn't handle that correctly
+ so you should set a width in em in local_layout.css */
/*FORM#quickconnect INPUT.text,
FORM#quickconnect INPUT.password {
width: 95%;
}*/
FORM#quicksearch {
- margin-top: 4px;
- margin-bottom: 1px;
+ margin-top: 4px;
+ margin-bottom: 1px;
}
-input#qsearchInput {
- width: 90%;
+INPUT#qsearchInput {
+ width: 90%;
}
#menubar #mbMenu p { margin: 0px; padding: 0px; }
#menubar #menuTagCloud {
- text-align: center;
- margin: 5px 0;
+ text-align: center;
+ margin: 5px 0;
}
#menubar #menuTagCloud LI
{
- display: inline;
- white-space: nowrap; /* No line break in the LI but Opera set nowrap to */
+ display: inline;
+ white-space: nowrap; /* No line break in the LI but Opera set nowrap to */
}
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index fda136c29..eb260eeea 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -21,10 +21,10 @@
{/if}{*links*}
{if isset($U_START_FILTER)}
- <a href="{$U_START_FILTER}" title="{'start_filter_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="{'start_filter_hint'|@translate}"></a>
+ <a href="{$U_START_FILTER}" title="{'start_filter_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
{/if}
{if isset($U_STOP_FILTER)}
- <a href="{$U_STOP_FILTER}" title="{'stop_filter_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="{'stop_filter_hint'|@translate}"></a>
+ <a href="{$U_STOP_FILTER}" title="{'stop_filter_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
{/if}
<dl id="mbCategories">
@@ -48,14 +48,14 @@
<ul id="menuTagCloud">
{foreach from=$related_tags item=tag}
<li>
- {if !empty($tag.add) }
- <a href="{$tag.add.URL}"
- title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.add.COUNTER)}"
+ {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>
{/if}
- <a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See elements linked to this tag only'|@translate}">{$tag.NAME}</a>
+ <a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See elements linked to this tag only'|@translate}">{$tag.name}</a>
</li>
{/foreach}
</ul>
diff --git a/template/yoga/tags.tpl b/template/yoga/tags.tpl
index cf41fd973..19a3a9a93 100644
--- a/template/yoga/tags.tpl
+++ b/template/yoga/tags.tpl
@@ -20,7 +20,7 @@
{if $display_mode == 'cloud'}
<ul id="fullTagCloud">
{foreach from=$tags item=tag}
- <li><a href="{$tag.URL}" class="{$tag.CLASS}" title="{$tag.TITLE}">{$tag.NAME}</a></li>
+ <li><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$tag.counter}">{$tag.name}</a></li>
{/foreach}
</ul>
{/if}
@@ -35,8 +35,8 @@
<table class="tagLetterContent">
{foreach from=$letter.tags item=tag}
<tr class="tagLine">
- <td><a href="{$tag.URL}">{$tag.NAME}</a></td>
- <td class="nbEntries">{$pwg->l10n_dec('%d element', '%d elements', $tag.COUNTER)}</td>
+ <td><a href="{$tag.URL}">{$tag.name}</a></td>
+ <td class="nbEntries">{$pwg->l10n_dec('%d element', '%d elements', $tag.counter)}</td>
</tr>
{/foreach}
</table>
@@ -52,4 +52,4 @@
{/if}
{/if}
-</div> <!-- content -->
+</div> <!-- content --> \ No newline at end of file