Changeset 6323 for branches/2.1/admin/themes/default/template

Timestamp:

05/24/10 13:19:04 (3 years ago)

Author:

plg

Message:

merge r6320 from trunk to branch 2.1

bug 1667 fixed: r6027 was fixing a minor error on tabs for Google Chrome/Safari
BUT was introducing a major visual issue for IE8. Backmerged + adds the -webkit
radius anyway.

This is a quickfix for release 2.1.1, the improved display introduced by nikrou
was nice and it would be better to have it, but working in IE8

Location:

branches/2.1

Files:

• . (modified) (1 prop)
• admin (modified) (1 prop)
• admin/themes (modified) (1 prop)
• admin/themes/default (modified) (1 prop)
• admin/themes/default/template (modified) (1 prop)
• admin/themes/default/template/admin.tpl (modified) (1 diff, 1 prop)
• admin/themes/default/template/cat_list.tpl (modified) (1 prop)
• admin/themes/default/template/cat_modify.tpl (modified) (1 prop)
• admin/themes/default/template/cat_move.tpl (modified) (1 prop)
• admin/themes/default/template/cat_options.tpl (modified) (1 prop)
• admin/themes/default/template/cat_perm.tpl (modified) (1 prop)
• admin/themes/default/template/check_integrity.tpl (modified) (1 prop)
• admin/themes/default/template/comments.tpl (modified) (1 prop)
• admin/themes/default/template/configuration.tpl (modified) (1 prop)
• admin/themes/default/template/double_select.tpl (modified) (1 prop)
• admin/themes/default/template/element_set_global.tpl (modified) (1 prop)
• admin/themes/default/template/element_set_ranks.tpl (modified) (1 prop)
• admin/themes/default/template/element_set_unit.tpl (modified) (1 prop)
• admin/themes/default/template/extend_for_templates.tpl (modified) (1 prop)
• admin/themes/default/template/footer.tpl (modified) (1 prop)
• admin/themes/default/template/group_list.tpl (modified) (1 prop)
• admin/themes/default/template/group_perm.tpl (modified) (1 prop)
• admin/themes/default/template/header.tpl (modified) (1 prop)
• admin/themes/default/template/help.tpl (modified) (1 prop)
• admin/themes/default/template/history.tpl (modified) (1 prop)
• admin/themes/default/template/install.tpl (modified) (1 prop)
• admin/themes/default/template/intro.tpl (modified) (1 prop)
• admin/themes/default/template/languages_installed.tpl (modified) (1 prop)
• admin/themes/default/template/languages_new.tpl (modified) (1 prop)
• admin/themes/default/template/maintenance.tpl (modified) (1 prop)
• admin/themes/default/template/menubar.tpl (modified) (1 prop)
• admin/themes/default/template/navigation_bar.tpl (modified) (1 prop)
• admin/themes/default/template/notification_by_mail.tpl (modified) (1 prop)
• admin/themes/default/template/permalinks.tpl (modified) (1 prop)
• admin/themes/default/template/photos_add_direct.tpl (modified) (1 prop)
• admin/themes/default/template/photos_add_ftp.tpl (modified) (1 prop)
• admin/themes/default/template/photos_add_ploader.tpl (modified) (1 prop)
• admin/themes/default/template/photos_add_settings.tpl (modified) (1 prop)
• admin/themes/default/template/picture_modify.tpl (modified) (1 prop)
• admin/themes/default/template/plugins_list.tpl (modified) (1 prop)
• admin/themes/default/template/plugins_new.tpl (modified) (1 prop)
• admin/themes/default/template/plugins_update.tpl (modified) (1 prop)
• admin/themes/default/template/popuphelp.tpl (modified) (1 prop)
• admin/themes/default/template/profile.tpl (modified) (1 prop)
• admin/themes/default/template/profile_content.tpl (modified) (1 prop)
• admin/themes/default/template/rating.tpl (modified) (1 prop)
• admin/themes/default/template/site_manager.tpl (modified) (1 prop)
• admin/themes/default/template/site_update.tpl (modified) (1 prop)
• admin/themes/default/template/stats.tpl (modified) (1 prop)
• admin/themes/default/template/tabsheet.tpl (modified) (1 prop)
• admin/themes/default/template/tags.tpl (modified) (1 prop)
• admin/themes/default/template/themes_installed.tpl (modified) (1 prop)
• admin/themes/default/template/themes_new.tpl (modified) (1 prop)
• admin/themes/default/template/thumbnail.tpl (modified) (1 prop)
• admin/themes/default/template/upgrade.tpl (modified) (1 prop)
• admin/themes/default/template/upload.tpl (modified) (1 prop)
• admin/themes/default/template/user_list.tpl (modified) (1 prop)
• admin/themes/default/template/user_perm.tpl (modified) (1 prop)

branches/2.1

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6265*
+/trunk:6265*,6320*

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6265*
+/trunk:6265*,6320*

branches/2.1/admin

@@ -1 +1 @@
 /branches/2.0/admin:4963
-/trunk/admin:6265*
+/trunk/admin:6265*,6320*

@@ -1 +1 @@
 /branches/2.0/admin:4963
-/trunk/admin:6265*
+/trunk/admin:6265*,6320*

branches/2.1/admin/themes

@@ -1 +1 @@
 /branches/2.0/admin/themes:4963
-/trunk/admin/themes:6265*
+/trunk/admin/themes:6265*,6320*

@@ -1 +1 @@
 /branches/2.0/admin/themes:4963
-/trunk/admin/themes:6265*
+/trunk/admin/themes:6265*,6320*

branches/2.1/admin/themes/default

@@ -1 +1 @@
 /branches/2.0/admin/themes/default:4963
-/trunk/admin/themes/default:6265*
+/trunk/admin/themes/default:6265*,6320*

@@ -1 +1 @@
 /branches/2.0/admin/themes/default:4963
-/trunk/admin/themes/default:6265*
+/trunk/admin/themes/default:6265*,6320*

branches/2.1/admin/themes/default/template/admin.tpl

@@ -92 +92 @@
 </div> <!-- menubar -->
 
-{if isset($TABSHEET)}
-{$TABSHEET}
-{/if}
+<div id="content" class="content">
 
-<div id="content" class="content{if isset($TABSHEET)} with-tabs{/if}">
+  {if isset($TABSHEET)}
+  {$TABSHEET}
+  {/if}
   {if isset($U_HELP)}
   <ul class="HelpActions">

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6265*
+/trunk:6265*,6320*

@@ -1 +1 @@
 /branches/2.0/admin:4963
-/trunk/admin:6265*
+/trunk/admin:6265*,6320*

@@ -1 +1 @@
 /branches/2.0/admin/themes:4963
-/trunk/admin/themes:6265*
+/trunk/admin/themes:6265*,6320*

@@ -1 +1 @@
 /branches/2.0/admin/themes/default:4963
-/trunk/admin/themes/default:6265*
+/trunk/admin/themes/default:6265*,6320*