Changeset 6323 for branches/2.1/admin/themes/default
- Timestamp:
- May 24, 2010, 1:19:04 PM (14 years ago)
- Location:
- branches/2.1
- Files:
-
- 73 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.1
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/content.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/default-colors.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/default-layout.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/fix-ie5-ie6.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/index.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/layout.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/local-layout.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/local_head.tpl
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/menubar.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/picture.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/print.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/template
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template merged non-inheritable eligible /branches/2.0/admin/themes/default/template 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/admin.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/admin.tpl merged eligible /branches/2.0/admin/themes/default/template/admin.tpl 4963
r6056 r6323 92 92 </div> <!-- menubar --> 93 93 94 {if isset($TABSHEET)} 95 {$TABSHEET} 96 {/if} 94 <div id="content" class="content"> 97 95 98 <div id="content" class="content{if isset($TABSHEET)} with-tabs{/if}"> 96 {if isset($TABSHEET)} 97 {$TABSHEET} 98 {/if} 99 99 {if isset($U_HELP)} 100 100 <ul class="HelpActions"> -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_list.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_list.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_list.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_modify.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_modify.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_modify.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_move.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_move.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_move.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_options.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_options.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_options.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_perm.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_perm.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_perm.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/check_integrity.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/check_integrity.tpl merged eligible /branches/2.0/admin/themes/default/template/check_integrity.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/comments.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/comments.tpl merged eligible /branches/2.0/admin/themes/default/template/comments.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/configuration.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/configuration.tpl merged eligible /branches/2.0/admin/themes/default/template/configuration.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/double_select.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/double_select.tpl merged eligible /branches/2.0/admin/themes/default/template/double_select.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/element_set_global.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/element_set_global.tpl merged eligible /branches/2.0/admin/themes/default/template/element_set_global.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/element_set_ranks.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/element_set_ranks.tpl merged eligible /branches/2.0/admin/themes/default/template/element_set_ranks.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/element_set_unit.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/element_set_unit.tpl merged eligible /branches/2.0/admin/themes/default/template/element_set_unit.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/extend_for_templates.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/extend_for_templates.tpl merged eligible /branches/2.0/admin/themes/default/template/extend_for_templates.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/footer.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/footer.tpl merged eligible /branches/2.0/admin/themes/default/template/footer.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/group_list.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/group_list.tpl merged eligible /branches/2.0/admin/themes/default/template/group_list.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/group_perm.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/group_perm.tpl merged eligible /branches/2.0/admin/themes/default/template/group_perm.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/header.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/header.tpl merged eligible /branches/2.0/admin/themes/default/template/header.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/help.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/help.tpl merged eligible /branches/2.0/admin/themes/default/template/help.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/history.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/history.tpl merged eligible /branches/2.0/admin/themes/default/template/history.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/install.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/install.tpl merged eligible /branches/2.0/admin/themes/default/template/install.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/intro.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/intro.tpl merged eligible /branches/2.0/admin/themes/default/template/intro.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/languages_installed.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/languages_installed.tpl merged eligible /branches/2.0/admin/themes/default/template/languages_installed.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/languages_new.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/languages_new.tpl merged eligible /branches/2.0/admin/themes/default/template/languages_new.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/maintenance.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/maintenance.tpl merged eligible /branches/2.0/admin/themes/default/template/maintenance.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/menubar.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/menubar.tpl merged eligible /branches/2.0/admin/themes/default/template/menubar.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/navigation_bar.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/navigation_bar.tpl merged eligible /branches/2.0/admin/themes/default/template/navigation_bar.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/notification_by_mail.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/notification_by_mail.tpl merged eligible /branches/2.0/admin/themes/default/template/notification_by_mail.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/permalinks.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/permalinks.tpl merged eligible /branches/2.0/admin/themes/default/template/permalinks.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/photos_add_direct.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/photos_add_direct.tpl merged eligible /branches/2.0/admin/themes/default/template/photos_add_direct.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/photos_add_ftp.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/photos_add_ftp.tpl merged eligible /branches/2.0/admin/themes/default/template/photos_add_ftp.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/photos_add_ploader.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/photos_add_ploader.tpl merged eligible /branches/2.0/admin/themes/default/template/photos_add_ploader.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/photos_add_settings.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/photos_add_settings.tpl merged eligible /branches/2.0/admin/themes/default/template/photos_add_settings.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/picture_modify.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/picture_modify.tpl merged eligible /branches/2.0/admin/themes/default/template/picture_modify.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/plugins_list.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/plugins_list.tpl merged eligible /branches/2.0/admin/themes/default/template/plugins_list.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/plugins_new.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/plugins_new.tpl merged eligible /branches/2.0/admin/themes/default/template/plugins_new.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/plugins_update.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/plugins_update.tpl merged eligible /branches/2.0/admin/themes/default/template/plugins_update.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/popuphelp.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/popuphelp.tpl merged eligible /branches/2.0/admin/themes/default/template/popuphelp.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/profile.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/profile.tpl merged eligible /branches/2.0/admin/themes/default/template/profile.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/profile_content.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/profile_content.tpl merged eligible /branches/2.0/admin/themes/default/template/profile_content.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/rating.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/rating.tpl merged eligible /branches/2.0/admin/themes/default/template/rating.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/site_manager.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/site_manager.tpl merged eligible /branches/2.0/admin/themes/default/template/site_manager.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/site_update.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/site_update.tpl merged eligible /branches/2.0/admin/themes/default/template/site_update.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/stats.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/stats.tpl merged eligible /branches/2.0/admin/themes/default/template/stats.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/tabsheet.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/tabsheet.tpl merged eligible /branches/2.0/admin/themes/default/template/tabsheet.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/tags.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/tags.tpl merged eligible /branches/2.0/admin/themes/default/template/tags.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/themes_installed.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/themes_installed.tpl merged eligible /branches/2.0/admin/themes/default/template/themes_installed.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/themes_new.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/themes_new.tpl merged eligible /branches/2.0/admin/themes/default/template/themes_new.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/thumbnail.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/thumbnail.tpl merged eligible /branches/2.0/admin/themes/default/template/thumbnail.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/upgrade.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/upgrade.tpl merged eligible /branches/2.0/admin/themes/default/template/upgrade.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/upload.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/upload.tpl merged eligible /branches/2.0/admin/themes/default/template/upload.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/user_list.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/user_list.tpl merged eligible /branches/2.0/admin/themes/default/template/user_list.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/user_perm.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/user_perm.tpl merged eligible /branches/2.0/admin/themes/default/template/user_perm.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/theme.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/themeconf.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/thumbnails.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/uploadify.jGrowl.css
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.