Item13214:Item13084 ease node layout in form

- configure.css was loaded twice - better reset icon - removed "Study Web Server" button from template still there in js
foswiki · Jan 14, 2015 · 2aac251 · 2aac251
1 parent fe71c45
commit 2aac251
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 18 deletions.
diff --git a/ConfigurePlugin/pub/System/ConfigurePlugin/configure.uncompressed.css b/ConfigurePlugin/pub/System/ConfigurePlugin/configure.uncompressed.css
@@ -63,19 +63,44 @@ html body {
 
 
 /* A node in the spec tree */
+.node ul {
+  margin:0;
+  padding-left:1em;
+}
 .node .node {
-    padding-bottom: 0.5em;
-    margin-bottom:1em;
-    border-bottom:1px solid #eee;
+    padding:0.5em 0 0.5em 10em;
+    margin:0;
+    border-top:1px solid #eee;
+}
+.node .node:first {
+  border-top:0;
+}
+.ui-tabs-panel > .node {
+  padding-left:0;
+  border-top:0;
 }
 .node .keys {
-  margin-right:0.5em;
+  min-width:10em;
+  margin-left:-10em;
   display:inline-block;
 }
-.node .description,
-.node .reports {
-  color:gray;
-  margin:0.5em 0;
+.node .description {
+  padding:0 0 0.5em;
+  margin:0 0 1em;
+}
+.node .node input,
+.node .node button,
+.node .node .description,
+.node .node .reports {
+  margin:0.5em 0 0.5em 0.5em;
+}
+.node .reports, 
+.node .description {
+  color:#808080;
+}
+.node strong,
+.node b {
+  color:#444;
 }
 
 .value_modified {
@@ -193,10 +218,7 @@ p.one_line_report {
 .control_button {
     width: 20px !important;
     height: 20px !important;
-}
-
-.default-icon {
-    background-image: url("reset-icon.png") !important;
+    margin:0 0.5em;
 }
 
 .info-icon {
@@ -205,8 +227,8 @@ p.one_line_report {
 
 div.expert {
     background-image: url(expert.png);
-    padding-left: 60px !important;
-    background-position: left 45%;
+    padding-right: 60px !important;
+    background-position: right 0.5em;
     background-repeat: no-repeat;
 }
 

diff --git a/ConfigurePlugin/pub/System/ConfigurePlugin/configure.uncompressed.js b/ConfigurePlugin/pub/System/ConfigurePlugin/configure.uncompressed.js
@@ -625,7 +625,7 @@ function _id_ify(id) {
             check_current_value($node, true);
         }).button({
             icons: {
-                primary: "default-icon"
+                primary: "ui-icon-arrowrefresh-1-w"
             },
             text: false
         }).hide();
@@ -847,7 +847,8 @@ function _id_ify(id) {
                     }
                     // Don't do this; configuration items are referred to
                     // using the {} syntax throughout the doc.
-                    //label = label.replace(/\}\{/g, "::").replace(/\{|\}/g, "");
+                    // Still it is noise looking ugly.
+                    label = label.replace(/\}\{/g, "::").replace(/\{|\}/g, "");
                     $node.append('<b class="keys">'
                                  + label
                                  + "</b><span class='ui-placeholder'></span>");
@@ -966,6 +967,7 @@ function _id_ify(id) {
             }
         });
 
+/*
         $('#webCheckButton').button().click(function() {
              auth_action = function() {
                  var params = {
@@ -984,6 +986,7 @@ function _id_ify(id) {
                 'option', 'title', 'Webserver authentication');
             $('#auth_prompt').dialog("open");
         });
+*/
 
         $('#closeSearchButton').button().click(function() {
             $('#searchResults').hide();

diff --git a/ConfigurePlugin/templates/configure.tmpl b/ConfigurePlugin/templates/configure.tmpl
@@ -28,7 +28,6 @@ configure.js script.
   <link type="text/css" media="all" rel="stylesheet" href="%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css" />
   %JQREQUIRE{"configure"}%
   %RENDERZONE{"head"}%
-  <link type="text/css" media="all" rel="stylesheet" href="%PUBURLPATH%/%SYSTEMWEB%/ConfigurePlugin/configure.css" />
   %RENDERZONE{"script"}%
  </head>
  <body>
@@ -37,7 +36,6 @@ configure.js script.
     <div class="top_level_buttons">
       <input type="text" style="width:30em" id="searchInput" title="Enter a string to search for"/>
       <button id="searchButton" title="Search in titles and keys">Search</button> 
-      <button id="webCheckButton">Study Web Server</button> 
       <input id="showExpert" type="checkbox"><label for="showExpert">Show expert options</label> 
       <button id="saveButton">Save</button>
     </div>