Changeset 1834:f4c0c4d04639 for inc/admin

Timestamp:

09/12/13 00:08:55 (12 years ago)

Author:

kevin@…

Branch:

Ticket #1539

Parents:

1833:81903fe2f6eb (diff), 1799:a5868fc53e27 (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:

Fusion avec default

Files:

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

inc/admin/lib.dc.page.php

@@ -584 +584 @@
           self::jsVar('dotclear.msg.xhtml_not_valid',
                __('There are XHTML markup errors.')).
+          self::jsVar('dotclear.msg.warning_validate_no_save_content',
+               __('Attention: an audit of a content not yet registered.')).
           self::jsVar('dotclear.msg.confirm_change_post_format',
                __('You have unsaved changes. Switch post format will loose these changes. Proceed anyway?')).

inc/admin/lib.dc.page.php

@@ -206 +206 @@
           echo
           '</div>'."\n".      // End of #main-menu
-          '<div id="footer"><a href="http://dotclear.org/" title="'.$text.'"><img src="style/dc_logos/w-dotclear90.png" alt="'.$text.'" /></a></div>'."\n".
+          '<div id="footer">'.
+          '<span class="helplink"><a href="help.php">'.__('Global help').'</a></span> '.
+          '<a href="http://dotclear.org/" title="'.$text.'"><img src="style/dc_logos/w-dotclear90.png" alt="'.$text.'" /></a></div>'."\n".
           '<!-- '."\n".
 '                  .'."\n".
@@ -434 +436 @@
           '<div id="help"><hr /><div class="help-content clear"><h3>'.__('Help about this page').'</h3>'.
           $content.
+          '</div>'.
+          '<div id="helplink"><hr />'.
+          '<p>'.
+          sprintf(__('See also %s'),sprintf('<a href="help.php">%s</a>',__('the global help'))).
+          '</p>'.
           '</div></div>';
      }