From 7dc84237707faad92abbbed8bcbf1c6b9132c776 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Sun, 16 Jun 2013 16:23:45 +0000 Subject: feature:2884 Display "i" tooltip on themes + simplify layout (like plugins_installed) git-svn-id: http://piwigo.org/svn/trunk@23259 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/template/themes_installed.tpl | 120 ++++++++++++--------- admin/themes/default/theme.css | 7 +- 2 files changed, 75 insertions(+), 52 deletions(-) (limited to 'admin/themes/default') diff --git a/admin/themes/default/template/themes_installed.tpl b/admin/themes/default/template/themes_installed.tpl index c1c5eb66b..d2f0401fb 100644 --- a/admin/themes/default/template/themes_installed.tpl +++ b/admin/themes/default/template/themes_installed.tpl @@ -1,8 +1,18 @@ {include file='include/colorbox.inc.tpl'} + {footer_script}{literal} jQuery(document).ready(function() { - $("a.preview-box").colorbox(); -}); + $("a.preview-box").colorbox(); + + jQuery('.showInfo').tipTip({ + 'delay' : 0, + 'fadeIn' : 200, + 'fadeOut' : 200, + 'maxWidth':'300px', + 'keepAlive':true, + 'activation':'click' + }); +}); {/literal}{/footer_script}
@@ -11,66 +21,80 @@ jQuery(document).ready(function() {
-
-{'Active Themes'|@translate} -{if isset($active_themes)} -
-{foreach from=$active_themes item=theme} -
-
{$theme.name}{if $theme.is_default} ({'default'|@translate}){/if} {if $theme.mobile} ({'Mobile'|@translate}){/if}
-
-
-
-{if $theme.deactivable} - {'Deactivate'|@translate} -{else} - {'Deactivate'|@translate} -{/if} - -{if not $theme.is_default} - | {'Default'|@translate} -{/if} -{if isset($theme.admin_uri)} -
{'Configuration'|@translate} -{/if} -
-
-
-{/foreach} -
+{assign var='field_name' value='null'} {* *} +{foreach from=$tpl_themes item=theme} + +{if $field_name != $theme.STATE} + {if $field_name != 'null'} +
+ + {/if} + +
+ + {if $theme.STATE == 'active'} + {'Active Themes'|@translate} + {else} + {'Inactive Themes'|@translate} + {/if} + +
+ {assign var='field_name' value=$theme.STATE} {/if} -
-{if isset($inactive_themes)} -
-{'Inactive Themes'|@translate} -
-{foreach from=$inactive_themes item=theme} -
-
{$theme.name}{if $theme.mobile} ({'Mobile'|@translate}){/if}
-
+ {if not empty($theme.AUTHOR)} + {if not empty($theme.AUTHOR_URL)} + {assign var='author' value="%s"|@sprintf:$theme.AUTHOR_URL:$theme.AUTHOR} + {else} + {assign var='author' value=''|cat:$theme.AUTHOR|cat:''} + {/if} + {/if} + {if not empty($theme.VISIT_URL)} + {assign var='version' value=""|cat:$theme.VERSION|cat:""} + {else} + {assign var='version' value=$theme.VERSION} + {/if} + +
+
+ {$theme.NAME} {if $theme.IS_DEFAULT}({'default'|@translate}){/if} {if $theme.IS_MOBILE}({'Mobile'|@translate}){/if} + i +
+
- {if $theme.activable} - {'Activate'|@translate} +{if $theme.STATE == 'active'} + {if $theme.DEACTIVABLE} + {'Deactivate'|@translate} {else} - {'Activate'|@translate} + {'Deactivate'|@translate} {/if} + {if not $theme.IS_DEFAULT} + | {'Default'|@translate} + {/if} + {if $theme.ADMIN_URI} +
{'Configuration'|@translate} + {/if} +{else} + {if $theme.ACTIVABLE} + {'Activate'|@translate} + {else} + {'Activate'|@translate} + {/if} | - - {if $theme.deletable} - {'Delete'|@translate} + {if $theme.DELETABLE} + {'Delete'|@translate} {else} - {'Delete'|@translate} + {'Delete'|@translate} {/if} +{/if}
-
- +
+ {/foreach}
-{/if}
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index a3b27e309..ce8b78b9e 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -758,10 +758,10 @@ html, body {height:100%; margin:0; padding:0;} #thePopuphelpPage #pwgHead {display:none} #thePopuphelpPage #footer {display:none} -.themeBox {display:inline-table; text-align:center; height:192px; background-color:#eee; margin:5px; -moz-border-radius:5px; overflow:hidden; } +.themeBox {display:inline-table; text-align:center; height:192px; background-color:#eee; margin:5px; border-radius:5px; overflow:hidden; } .themeBox IMG {border:1px solid white; margin:0 15px;} -.themeName {font-size:1.1em; margin:5px 0;} +.themeName {font-size:1em; margin:5px 0; position:relative; } .themeActions {display: table-row; font-size:12px; height: 43px; } .themeActions DIV {display: table-cell; vertical-align: middle; line-height:18px; } .themeActions A {} @@ -864,7 +864,7 @@ h2:lang(en) { text-transform:capitalize; } .languageActions {display: table-row; font-size:12px; } .languageActions DIV {display: table-cell; vertical-align: middle; line-height:18px; } -#ui-datepicker-div {-moz-border-radius:5px;} +#ui-datepicker-div {-moz-border-radius:5px; border-radius:5px;} #ui-datepicker-div .ui-icon-circle-triangle-w, #ui-datepicker-div .ui-icon-circle-triangle-e {color:transparent;} #ui-datepicker-div A.ui-datepicker-prev, #ui-datepicker-div A.ui-datepicker-next {background-color:transparent;} #ui-datepicker-div A.ui-datepicker-prev:hover, #ui-datepicker-div A.ui-datepicker-next:hover {-moz-border-radius:5px;} @@ -1100,7 +1100,6 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} border-radius:10px; -moz-border-radius:10px; -webkit-border-radius:10px; - -border-radius:10px; margin-left:5px; } -- cgit v1.2.3