Changeset 3398:88f3d2561542

Timestamp:

11/09/16 11:35:30 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add a user preference to hide additional information (.more-info class) and normal notes (.form-note class) (.info, .warn and .warning remain displayed)

Files:

• admin/blog_theme.php (modified) (3 diffs)
• admin/js/common.js (modified) (1 diff)
• admin/media.php (modified) (1 diff)
• admin/media_item.php (modified) (1 diff)
• admin/plugins.php (modified) (4 diffs)
• admin/preferences.php (modified) (3 diffs)
• admin/style/default.css (modified) (3 diffs)
• admin/style/scss/init/_config.scss (modified) (1 diff)
• admin/style/scss/partials/_forms.scss (modified) (1 diff)
• admin/style/scss/partials/_index.scss (modified) (7 diffs)
• admin/user.php (modified) (2 diffs)
• inc/admin/lib.dc.page.php (modified) (2 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/blog_theme.php

@@ -148 +148 @@
      '<div class="multi-part" id="themes" title="'.__('Installed themes').'">'.
      '<h3>'.__('Installed themes').'</h3>'.
-     '<p>'.__('You can configure and manage installed themes from this list.').'</p>';
+     '<p class="more-info">'.__('You can configure and manage installed themes from this list.').'</p>';
 
      $list
@@ -170 +170 @@
      '<div class="multi-part" id="deactivate" title="'.__('Deactivated themes').'">'.
      '<h3>'.__('Deactivated themes').'</h3>'.
-     '<p>'.__('Deactivated themes are installed but not usable. You can activate them from here.').'</p>';
+     '<p class="more-info">'.__('Deactivated themes are installed but not usable. You can activate them from here.').'</p>';
 
      $list
@@ -223 +223 @@
      '<div class="multi-part" id="addtheme" title="'.__('Install or upgrade manually').'">'.
      '<h3>'.__('Add themes from a package').'</h3>'.
-     '<p>'.__('You can install themes by uploading or downloading zip files.').'</p>';
+     '<p class="more-info">'.__('You can install themes by uploading or downloading zip files.').'</p>';
 
      $list->displayManualForm();

admin/js/common.js

@@ -564 +564 @@
           return true;
      });
+
+     if (dotclear.hideMoreInfo) {
+          $('.more-info,.form-note:not(.warn,.warning,.info)').addClass('no-more-info');
+     }
 
      // Main menu collapser

admin/media.php

@@ -798 +798 @@
      echo
      '<h4>'.__('Add files').'</h4>'.
-     '<p>'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'.
+     '<p class="more-info">'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'.
      '<form id="fileupload" action="'.html::escapeURL($core->adminurl->get('admin.media',$page_url_params)).'" method="post" enctype="multipart/form-data" aria-disabled="false">'.
      '<p>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).

admin/media_item.php

@@ -726 +726 @@
           '<form class="clear fieldset" action="'.$core->adminurl->get("admin.media.item").'" method="post">'.
           '<h4>'.__('Update thumbnails').'</h4>'.
-          '<p>'.__('This will create or update thumbnails for this image.').'</p>'.
+          '<p class="more-info">'.__('This will create or update thumbnails for this image.').'</p>'.
           '<p><input type="submit" name="thumbs" value="'.__('Update thumbnails').'" />'.
           $core->adminurl->getHiddenFormFields('admin.media',$page_url_params).

admin/plugins.php

@@ -160 +160 @@
      echo
      '<h3>'.($core->auth->isSuperAdmin() ?__('Activated plugins') : __('Installed plugins')).'</h3>'.
-     '<p>'.__('You can configure and manage installed plugins from this list.').'</p>';
+     '<p class="more-info">'.__('You can configure and manage installed plugins from this list.').'</p>';
 
      $list
@@ -178 +178 @@
           echo
           '<h3>'.__('Deactivated plugins').'</h3>'.
-          '<p>'.__('Deactivated plugins are installed but not usable. You can activate them from here.').'</p>';
+          '<p class="more-info">'.__('Deactivated plugins are installed but not usable. You can activate them from here.').'</p>';
 
           $list
@@ -204 +204 @@
           '<div class="multi-part" id="new" title="'.__('Add plugins').'">'.
           '<h3>'.__('Add plugins from repository').'</h3>';
-//        '<p>'.__('Search and install plugins directly from repository.').'</p>';
 
           $list
@@ -232 +231 @@
      '<div class="multi-part" id="addplugin" title="'.__('Install or upgrade manually').'">'.
      '<h3>'.__('Add plugins from a package').'</h3>'.
-     '<p>'.__('You can install plugins by uploading or downloading zip files.').'</p>';
+     '<p class="more-info">'.__('You can install plugins by uploading or downloading zip files.').'</p>';
 
      $list->displayManualForm();

admin/preferences.php

@@ -42 +42 @@
 $core->auth->user_prefs->addWorkspace('interface');
 $user_ui_enhanceduploader = $core->auth->user_prefs->interface->enhanceduploader;
+$user_ui_hidemoreinfo = $core->auth->user_prefs->interface->hidemoreinfo;
 if ($core->auth->isSuperAdmin()) {
      $user_ui_hide_std_favicon = $core->auth->user_prefs->interface->hide_std_favicon;
@@ -229 +230 @@
           $core->auth->user_prefs->accessibility->put('nodragdrop',!empty($_POST['user_acc_nodragdrop']),'boolean');
           $core->auth->user_prefs->interface->put('enhanceduploader',!empty($_POST['user_ui_enhanceduploader']),'boolean');
+          $core->auth->user_prefs->interface->put('hidemoreinfo',!empty($_POST['user_ui_hidemoreinfo']),'boolean');
           if ($core->auth->isSuperAdmin()) {
                # Applied to all users
@@ -499 +501 @@
 form::checkbox('user_acc_nodragdrop',1,$user_acc_nodragdrop).' '.
 __('Disable javascript powered drag and drop for ordering items').'</label></p>'.
-'<p class="clear form-note">'.__('If checked, numeric fields will allow to type the elements\' ordering number.').'</p>';
+'<p class="clear form-note">'.__('If checked, numeric fields will allow to type the elements\' ordering number.').'</p>'.
+
+'<p><label for="user_ui_hidemoreinfo" class="classic">'.
+form::checkbox('user_ui_hidemoreinfo',1,$user_ui_hidemoreinfo).' '.
+__('Hide all secondary information and notes').'</label></p>';
 
 echo

admin/style/default.css

@@ -1164 +1164 @@
 span.form-note {
   text-transform: none; }
+
+.no-more-info {
+  display: none; }
 
 /* Removes inner padding and border in FF3+  - Knacss */
@@ -2091 +2094 @@
 /* raccourcis */
 #icons {
-  overflow: hidden;
-  text-align: center; }
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center; }
 
 #icons p {
   width: 13em;
   text-align: center;
-  margin: 1em 0 2em;
-  display: inline-block;
-  vertical-align: top; }
+  margin: 1em 0 2em; }
 
 #icons a,
@@ -2174 +2176 @@
 #dashboard-boxes {
   margin: 1em auto 1em;
-  padding-top: 2em; }
-
-.db-items,
-.db-contents {
-  display: inline-block;
-  text-align: center; }
+  padding-top: 2em;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center; }
 
 .no-js .outgoing img {

admin/style/scss/init/_config.scss

@@ -2 +2 @@
 
 // ----------------- Compass config --------------- //
-// Do not support IE less than IE9
+// Do not support IE less than IE10
 $browser-minimum-versions: (
   "ie": "10"

admin/style/scss/partials/_forms.scss

@@ -208 +208 @@
     text-transform: none;
 }
+
+// .more-info Additional information on fieldset, field, … (may be hide from user-prefs)
+.more-info {
+}
+.no-more-info {
+    display: none;
+}

admin/style/scss/partials/_index.scss

@@ -1 +1 @@
 #dashboard-main {
-    text-align: center;
+     text-align: center;
 }
 
@@ -7 +7 @@
 
 #icons {
-    overflow: hidden;
-    text-align: center;
+//    overflow: hidden;
+//    text-align: center;
+     display: flex;
+     flex-wrap: wrap;
+     justify-content: center;
 }
 
 #icons p {
-    width: 13em;
-    text-align: center;
-    margin: 1em 0 2em;
-    display: inline-block;
-    vertical-align: top;
+     width: 13em;
+     text-align: center;
+     margin: 1em 0 2em;
+//    display: inline-block;
+//    vertical-align: top;
 }
 
@@ -24 +27 @@
 #icons a:hover,
 #icons a:focus {
-    border-bottom-width: 0;
-    text-decoration: none;
+     border-bottom-width: 0;
+     text-decoration: none;
 }
 
 #icons a span {
-    border-bottom: 1px dotted #999;
-    color: #333;
+     border-bottom: 1px dotted #999;
+     color: #333;
 }
 
 #icons a img {
-    padding: 1.5em;
-    background-color: #f9f9f9;
-    border-radius: 8px;
-    border: 1px solid #dadada;
-    display: inline-block;
+     padding: 1.5em;
+     background-color: #f9f9f9;
+     border-radius: 8px;
+     border: 1px solid #dadada;
+     display: inline-block;
 }
 
 #icons a:focus img,
 #icons a:hover img {
-    background: #bee74b;
-    outline: 0;
-    border-color: #dadada;
+     background: #bee74b;
+     outline: 0;
+     border-color: #dadada;
 }
 
 #icons a:focus {
-    outline: 0;
-    border-color: #fff;
+     outline: 0;
+     border-color: #fff;
 }
 
 #icons a:hover span,
 #icons a:focus span {
-    border-bottom-style: solid;
+     border-bottom-style: solid;
 }
 
 #icons a:focus span {
-    border: 2px solid #bee74b;
+     border: 2px solid #bee74b;
 }
 
@@ -66 +69 @@
 
 #quick {
-    padding: 1em;
-    max-width: 976px;
-    margin: 0 auto;
-    background: #f5f5f5;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, .2);
-    text-align: left;
+     padding: 1em;
+     max-width: 976px;
+     margin: 0 auto;
+     background: #f5f5f5;
+     box-shadow: 0 1px 2px rgba(0, 0, 0, .2);
+     text-align: left;
 }
 
 #quick h3 {
-    margin-bottom: 0.2em;
-    font-size: 1.2em;
+     margin-bottom: 0.2em;
+     font-size: 1.2em;
 }
 
 #quick p.qinfo {
-    margin: -.7em -1em 1em;
-    background: #D9EDF7 url(info.png) no-repeat .2em .2em;
-    border: 1px solid #BCE8F1;
-    padding: .2em 1em .1em 24px;
-    color: #000;
+     margin: -.7em -1em 1em;
+     background: #D9EDF7 url(info.png) no-repeat .2em .2em;
+     border: 1px solid #BCE8F1;
+     padding: .2em 1em .1em 24px;
+     color: #000;
 }
 
@@ -90 +93 @@
 .q-cat,
 .q-cat label {
-    display: inline-block;
-    vertical-align: top;
-    margin-right: 1em;
-    margin-top: 0;
+     display: inline-block;
+     vertical-align: top;
+     margin-right: 1em;
+     margin-top: 0;
 }
 
 .q-cat label {
-    margin-right: .3em;
+     margin-right: .3em;
 }
 
 #quick #new_cat {
-    margin-bottom: 2em;
+     margin-bottom: 2em;
 }
 
@@ -108 +111 @@
 
 #dashboard-boxes {
-    margin: 1em auto 1em;
-    padding-top: 2em;
+     margin: 1em auto 1em;
+     padding-top: 2em;
+     display: flex;
+     flex-wrap: wrap;
+     justify-content: center;
 }
 
 .db-items,
 .db-contents {
-    display: inline-block;
-    text-align: center;
+//   display: inline-block;
+//   text-align: center;
 }
 
 .no-js .outgoing img {
-    display: none;
+     display: none;
 }
 
 #dashboard-boxes .box {
-    padding: 10px;
-    border: 1px solid #ccc;
-    border-radius: 3px;
-    min-height: 200px;
-    margin: 10px;
-    text-align: left;
+     padding: 10px;
+     border: 1px solid #ccc;
+     border-radius: 3px;
+     min-height: 200px;
+     margin: 10px;
+     text-align: left;
 }
 
 .dc-box {
-    background: transparent url(dc_logos/sq-logo-32.png) no-repeat top right;
+     background: transparent url(dc_logos/sq-logo-32.png) no-repeat top right;
 }
 
 .db-items img,
 .db-contents img {
-    vertical-align: middle;
+     vertical-align: middle;
 }
 
 .db-items ul,
 .db-contents ul {
-    display: block;
-    padding-left: 1.5em;
-    list-style: square;
+     display: block;
+     padding-left: 1.5em;
+     list-style: square;
 }
 
 .db-items li,
 .db-contents li {
-    margin: 0.25em 0 0 0;
+     margin: 0.25em 0 0 0;
 }
 
 #news dt {
-    font-weight: bold;
-    margin: 0 0 0.4em 0;
+     font-weight: bold;
+     margin: 0 0 0.4em 0;
 }
 
 #news dd {
-    margin: 0 0 1em 0;
+     margin: 0 0 1em 0;
 }
 
 #news dd p {
-    margin: 0.2em 0 0 0;
+     margin: 0.2em 0 0 0;
 }
 
@@ -169 +175 @@
 
 #upg-notify ul {
-    padding-left: 1.5em;
+     padding-left: 1.5em;
 }
 
 #upg-notify li {
-    color: #fff;
+     color: #fff;
 }

admin/user.php

@@ -210 +210 @@
 form::field('user_id',20,255,html::escapeHTML($user_id)).
 '</p>'.
-'<p class="form-note">'.__('At least 2 characters using letters, numbers or symbols.').'</p>';
+'<p class="form-note info">'.__('At least 2 characters using letters, numbers or symbols.').'</p>';
 
 if ($user_id == $core->auth->userID()) {
@@ -231 +231 @@
     '</div>'.
 '</div>'.
-'<p class="form-note">'.__('Password must contain at least 6 characters.').'</p>'.
+'<p class="form-note info">'.__('Password must contain at least 6 characters.').'</p>'.
 
 '<p><label for="new_pwd_c" '.($user_id != '' ? '' : 'class="required"').'>'.

inc/admin/lib.dc.page.php

@@ -176 +176 @@
           self::jsToggles().
           $head;
+
+          if ($core->auth->user_prefs->interface->hidemoreinfo) {
+               echo
+               '<script type="text/javascript">'."\n".
+               "//<![CDATA[\n".
+               'dotclear.hideMoreInfo = true;'.
+               "\n//]]>\n".
+               "</script>\n";
+          }
 
           # --BEHAVIOR-- adminPageHTMLHead
@@ -404 +413 @@
           self::jsToggles().
           $head;
+
+          $core->auth->user_prefs->addWorkspace('interface');
+          if ($core->auth->user_prefs->interface->hidemoreinfo) {
+               echo
+               '<script type="text/javascript">'."\n".
+               "//<![CDATA[\n".
+               'dotclear.hideMoreInfo = true;'.
+               "\n//]]>\n".
+               "</script>\n";
+          }
 
           # --BEHAVIOR-- adminPageHTMLHead

locales/fr/main.po

@@ -2192 +2192 @@
 msgstr "Interface"
 
+msgid "Hide all secondary information and notes"
+msgstr "Cacher les informations secondaires et les notes"
+
 msgid "Activate enhanced uploader in media manager"
 msgstr "Activer l'interface avancée de la médiathèque"