Changeset 1621:ee70ba4550a7

Timestamp:

08/30/13 10:45:43 (10 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Page: add New comment button and new comment form in "Comments" tab.
CSS: inputs borders

Files:

• admin/post.php (modified) (1 diff)
• admin/style/default.css (modified) (7 diffs)
• admin/style/jsToolBar/jsToolBar.css (modified) (2 diffs)
• admin/user.php (modified) (4 diffs)
• locales/fr/main.po (modified) (1 diff)
• plugins/pages/page.php (modified) (6 diffs)

admin/post.php

@@ -641 +641 @@
      
      if ($has_action) {
-          echo '<form action="comments_actions.php" id="form-comments" method="post" class="clear">';
-     }
-     
-     echo '<h3 class="clear">'.__('Trackbacks').'</h3>';
+          echo '<form action="comments_actions.php" id="form-comments" method="post">';
+     }
+     
+     echo '<h3>'.__('Trackbacks').'</h3>';
      
      if (!$trackbacks->isEmpty()) {

admin/style/default.css

@@ -26 +26 @@
      padding: 0;
 }
+
 a, a:link, a:visited {
      color: #2373A8;
@@ -378 +379 @@
 }
 #search-menu * {
-     height: 20px; /* ie < 9 sucks */
-     height: 2rem;
+     height: 22px; /* ie < 9 sucks */
+     height: 2.2rem;
+     display: inline-block;
+     vertical-align: top;
+     line-height: 22px;
 }
 #search-menu p {
-     display: inline-block;
      border: 1px solid #999;
      border-radius: .3em;
@@ -388 +391 @@
      overflow: hidden;
 }
-#search-menu #qx {
-     width: 120px; /* ie < 9 sucks */
-     width: 12rem;
+#qx {
+     width: 124px; /* ie < 9 sucks */
+     width: 12.4rem;
      border-bottom-left-radius: .3em;
      border-top-left-radius: .3em;
      background: transparent url(search.png) no-repeat 4px center;
      text-indent: 18px;
-     padding: 0 2px;
+     padding: 0;
      border: none;
+     height: 22px;
+     height: 2.2rem;
+}
+#qx:focus {
+     border: 2px solid #BBDB58;
 }
 #search-menu input[type="submit"] {
      padding: 0 3px;
      padding: 0 .3rem;
+     margin-left: -4px;
      background: #dfdfdf;
      border-color: #999;
@@ -621 +630 @@
      float: right;
 }
-#entry-sidebar input[type="text"],
 #entry-sidebar select {
-     width: 14em; /* to prevent inline with label */
+     width: 100%;
 }
 #entry-sidebar input#post_position {
@@ -1181 +1189 @@
      margin-top: 2em;
 }
+p.clear.vertical-separator {
+     padding-top: 2em;
+}
 .border-top {
      border-top: 1px solid #999;
@@ -1418 +1429 @@
      background: #f9f9f9;
      color: #000;
-     border-width: 1px;
+     border-width: 2px;
      border-style: solid;
-     border-color: #666 #ccc #ccc #999;
+     border-color: #ccc #ddd #ddd #ccc; 
+}
+select {
+     border-right: none;
 }
 input.invalid, textarea.invalid, select.invalid {
@@ -1547 +1561 @@
      -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
-     box-sizing: border-box;  
+     box-sizing: border-box;
      border: 2px solid #BBDB58;
 }

admin/style/jsToolBar/jsToolBar.css

@@ -6 +6 @@
 }
 .jstEditor textarea, .jstEditor iframe {
-  margin: 0;
-  border: 0;
-  padding: 0;
-}
-.jstEditor textarea {
      -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
      box-sizing: border-box;  
+     margin: 0;
+     border: 2px solid #f9f9f9;
      width: 100%;
      padding: .5em 0 0 0;
@@ -26 +23 @@
      border-style: solid;
 }
-.jstEditor textarea:focus {
+.jstEditor textarea:focus, .jstEditor iframe:focus {
      border: 2px solid #BBDB58;
 }

admin/user.php

@@ -206 +206 @@
 
 echo
-'<form action="user.php" method="post" id="user-form" class="fieldset">'.
+'<form action="user.php" method="post" id="user-form">'.
 '<div class="two-cols">'.
 
@@ -224 +224 @@
 
 echo
-'<form action="user.php" method="post" id="user-form">'.
-'<fieldset><legend>'.__('User information').'</legend>'.
-'<div class="two-cols">'.
-'<div class="col">'.
-'<p><label for="user_id" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Username:').' '.
-form::field('user_id',20,255,html::escapeHTML($user_id)).
-'</label></p>'.
-'<p class="form-note">'.__('At least 2 characters using letters, numbers or symbols.').'</p>'.
-
 '<div class="pw-table">'.
      '<p class="pw-cell">'.
@@ -319 +310 @@
 
 echo
-'<p class="clear border-top"><label for="your_pwd" class="required">'.
+'<p class="clear vertical-separator"><label for="your_pwd" class="required">'.
 '<abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label>'.
 form::password('your_pwd',20,255).'</p>'.
@@ -387 +378 @@
      } 
      else {
-          echo '<p>'.sprintf(__('User %s is super admin.'),$user_id).'</p>';
+          echo '<p>'.sprintf(__('%s is super admin (all rights on all blogs).'),'<strong>'.$user_id.'</strong>').'</p>';
      }    
      echo '</div>';

locales/fr/main.po

@@ -3244 +3244 @@
 msgstr "Identifiant (login) :"
 
+msgid "%s is super admin (all rights on all blogs)."
+msgstr "%s est super administrateur (tous les droits sur tous les blogs)."
+
 msgid "Interface"
 msgstr "Interface"

plugins/pages/page.php

@@ -455 +455 @@
                     'post_hide' => 
                          '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
-                         __('Hide in widget Pages').'</label></p>'.
+                         __('Hide in widget Pages').'</label>'.
                          '</p>',
                     'post_password' =>
@@ -557 +557 @@
      
      echo '</form>';
-     echo '</div>';
+     echo '</div>';      // End 
      
      if ($post_id && !empty($post_media))
@@ -600 +600 @@
      '<div id="comments" class="multi-part" title="'.__('Comments').'">';
      
+     echo
+     '<p class="top-add"><a class="button add onblog_link" href="#comment-form">'.__('Add a comment').'</a></p>';
+
      if ($has_action) {
           echo '<form action="comments_actions.php" method="post">';
@@ -632 +635 @@
           '</form>';
      }
-     
-     echo '</div>';
-}
-
-/* Add a comment
--------------------------------------------------------- */
-if ($post_id)
-{
+          /* Add a comment
+     -------------------------------------------------------- */
+
      echo
-     '<div class="multi-part" id="add-comment" title="'.__('Add a comment').'">'.
+     '<div class="fieldset clear">'.
      '<h3>'.__('Add a comment').'</h3>'.
      
@@ -658 +656 @@
      '</p>'.
      
-     '<p class="area"><label for="comment_content" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Comment:').'</label> '.
+     '<p class="area"><label for="comment_content" class="required"><abbr title="'.__('Required field').'">*</abbr> '.
+     __('Comment:').'</label> '.
      form::textarea('comment_content',50,8,html::escapeHTML('')).
      '</p>'.
@@ -665 +664 @@
      $core->formNonce().
      '<input type="submit" name="add" value="'.__('Save').'" /></p>'.
-     '</div>'.
+     '</div>'. #constrained
+
      '</form>'.
-     '</div>';
+     '</div>'. #add comment
+     '</div>'; #comments
 }