Changeset 2240:2553775ae2fe for inc

Timestamp:

10/04/13 09:19:33 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Parents:

2237:911f18a5b287 (diff), 2239:cd7100fa57db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from default

Location:

inc

Files:

• admin/lib.dc.page.php (modified) (2 diffs)
• admin/lib.dc.page.php (modified) (2 diffs)
• prepend.php (modified) (1 diff)
• prepend.php (modified) (2 diffs)

inc/admin/lib.dc.page.php

@@ -136 +136 @@
           '<form action="index.php" method="post" id="top-info-blog">'.
           $blog_box.
-          '<p><a href="'.$core->blog->url.'" onclick="window.open(this.href);return false;" title="'.__('Go to site').
-          ' ('.__('new window').')'.'">'.__('Go to site').'<img src="images/outgoing.png" alt="" /></a>'.
+          '<p><a href="'.$core->blog->url.'" class="outgoing" title="'.__('Go to site').
+          '">'.__('Go to site').'<img src="images/outgoing.png" alt="" /></a>'.
           '</p></form>'.
           '<ul id="top-info-user">'.
@@ -588 +588 @@
           self::jsVar('dotclear.msg.help',
                __('Need help?')).
+          self::jsVar('dotclear.msg.new_window',
+               __('new window')).
           self::jsVar('dotclear.msg.help_hide',
                __('Hide')).

inc/admin/lib.dc.page.php

@@ -580 +580 @@
           self::jsVar('dotclear.img_menu_on','images/menu_on.png').
           self::jsVar('dotclear.img_menu_off','images/menu_off.png').
+          
+          self::jsVar('dotclear.img_plus_theme_src','images/plus-theme.png').
+          self::jsVar('dotclear.img_plus_theme_alt',__('uncover')).
+          self::jsVar('dotclear.img_minus_theme_src','images/minus-theme.png').
+          self::jsVar('dotclear.img_minus_theme_alt',__('hide')).
 
           self::jsVar('dotclear.msg.help',
@@ -667 +672 @@
           self::jsVar('dotclear.msg.load_enhanced_uploader',
                __('Loading enhanced uploader, please wait.')).
+
+          self::jsVar('dotclear.msg.module_author',
+               __('Author:')).
+          self::jsVar('dotclear.msg.module_details',
+               __('Details')).
+          self::jsVar('dotclear.msg.module_support',
+               __('Support')).
+          self::jsVar('dotclear.msg.module_help',
+               __('Help:')).
+          self::jsVar('dotclear.msg.module_section',
+               __('Section:')).
+          self::jsVar('dotclear.msg.module_tags',
+               __('Tags:')).
                "\n//]]>\n".
           "</script>\n";

inc/prepend.php

@@ -49 +49 @@
 $__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php';
 $__autoload['dcStoreParser']       = dirname(__FILE__).'/core/class.dc.store.parser.php';
+$__autoload['dcFavorites']              = dirname(__FILE__).'/admin/class.dc.favorites.php';
 
 $__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';

inc/prepend.php

@@ -46 +46 @@
 $__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php';
 $__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php';
+$__autoload['dcStore']             = dirname(__FILE__).'/core/class.dc.store.php';
+$__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php';
+$__autoload['dcStoreParser']       = dirname(__FILE__).'/core/class.dc.store.parser.php';
 $__autoload['dcFavorites']              = dirname(__FILE__).'/admin/class.dc.favorites.php';
 
@@ -62 +65 @@
 $__autoload['dcPager']        = dirname(__FILE__).'/admin/lib.pager.php';
 $__autoload['dcAdminCombos']            = dirname(__FILE__).'/admin/lib.admincombos.php';
+$__autoload['adminModulesList']              = dirname(__FILE__).'/admin/lib.moduleslist.php';
+$__autoload['adminThemesList']               = dirname(__FILE__).'/admin/lib.moduleslist.php';
 
 $__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php';