Changeset 10359 for extensions/UserAdvManager/trunk/admin

Timestamp:

Apr 13, 2011, 7:12:49 PM (14 years ago)

Author:

Eric

Message:

Bug 2257 fixed - Improve admin panel display with clear theme

Location:

extensions/UserAdvManager/trunk/admin

Files:

• UAM_admin.php (modified) (2 diffs)
• template/global.tpl (modified) (1 diff)
• template/icon/collapse.gif (deleted)
• template/icon/expand.gif (deleted)
• template/themes (added)
• template/themes/clear (added)
• template/themes/clear/collapse.gif (added)
• template/themes/clear/expand.gif (added)
• template/themes/clear/theme.css (added)
• template/themes/default (added)
• template/themes/default/collapse.gif (added)
• template/themes/default/expand.gif (added)
• template/themes/default/theme.css (added)
• template/themes/roma (added)
• template/themes/roma/collapse.gif (added)
• template/themes/roma/expand.gif (added)
• template/themes/roma/theme.css (added)
• template/uam.css (modified) (2 diffs)

extensions/UserAdvManager/trunk/admin/UAM_admin.php

@@ -381 +381 @@
 
   // Template initialization for forms and data
+
+  $themeconf=$template->get_template_vars('themeconf');
+  $UAM_theme=$themeconf['id'];
+
   $template->assign(
     array(
@@ -388 +392 @@
     'UAM_PATH'                       => UAM_PATH,
     'UAM_DUMP_DOWNLOAD'              => $dump_download,
+    'UAM_THEME'                      => $UAM_theme,
                 'UAM_MAIL_INFO_TRUE'             => $conf_UAM[0]=='true' ?  'checked="checked"' : '' ,
                 'UAM_MAIL_INFO_FALSE'            => $conf_UAM[0]=='false' ?  'checked="checked"' : '' ,

extensions/UserAdvManager/trunk/admin/template/global.tpl

@@ -3 +3 @@
 
 {combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'}
+{if $UAM_THEME=='clear'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/clear/theme.css'}{/if}
+{if $UAM_THEME=='roma'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/roma/theme.css'}{/if}
+{if $UAM_THEME=='default'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/default/theme.css'}{/if}
+
 
 <script type="text/javascript">

extensions/UserAdvManager/trunk/admin/template/uam.css

@@ -38 +38 @@
 .instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded
 {
-  background-color:#111;
-  background-position:15px center;
-  background-repeat:no-repeat;
-  color:#ff3363;
-  cursor:pointer;
-  font-size:110%;
-  overflow:hidden;
-  padding:8px 41px;
+  background-color: #111;
+  background-position: 15px center;
+  background-repeat: no-repeat;
+  color: #ff3363;
+  cursor: pointer;
+  font-size: 110%;
+  overflow: hidden;
+  padding: 8px 41px;
   text-align: left;
 }
@@ -53 +53 @@
   border-bottom: none;
 }
- 
-.instructionBlockHeaderCollapsed
-{
-  background-image: url(./icon/expand.gif);
-}
-
-.instructionBlockHeaderExpanded
-{
-  background-image: url(./icon/collapse.gif);
-}
 
 .instructionBlockContent
 {
-  padding:0 15px 15px;
+  padding: 0 15px 15px;
 }