瀏覽代碼

[core] Updated UI of dump config page

Enrico Berti 10 年之前
父節點
當前提交
1e9c2a4a87
共有 1 個文件被更改,包括 113 次插入121 次删除
  1. 113 121
      desktop/core/src/desktop/templates/dump_config.mako

+ 113 - 121
desktop/core/src/desktop/templates/dump_config.mako

@@ -22,141 +22,133 @@ from django.utils.translation import ugettext as _
 
 <%namespace name="layout" file="about_layout.mako" />
 
-${ commonheader(_('Configuration'), "about", user) | n,unicode }
+${ commonheader(_('Configuration'), "about", user, "70px") | n,unicode }
 ${ layout.menubar(section='dump_config') }
 
 <style type="text/css">
-  #installedApps {
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-  }
-
-  #installedApps li {
-    display: inline;
-  }
-
-  .widget-content {
-    padding: 10px;
+  .card-heading .pull-right {
+    font-size: 12px;
+    font-weight: normal;
   }
 </style>
 
-    <div class="container-fluid">
-      <div class="row-fluid">
-        <div class="well" style="border-top-width:1px">
-        ${_('Configuration files located in')} <code style="color: #338BB8">${conf_dir}</code>
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="card card-home">
+      <h2 class="card-heading simple">
+        <div class="pull-right muted">
+          ${_('Configuration files located in')} <code style="color: #338BB8">${conf_dir}</code>
         </div>
-
-        <div class="card card-home">
-            <h2 class="card-heading simple">${_('Installed Applications')}</h2>
-          <div class="card-body">
-            <p>
-            <ul id="installedAppsz" class="nav nav-pills">
-            % for app in apps:
-                % if app.menu_index != 999:
-                  <li><a href="/${app.display_name if app.menu_index != 999 else ''}">${app.name}</a></li>
-                % else:
-                  <li><a>${app.name}</a></li>
+        ${_('Configuration Sections and Variables')}
+      </h2>
+      <div class="card-body clearfix">
+        <div class="span2">
+          <ul class="nav nav-pills nav-stacked">
+            % for obj in top_level:
+              <li
+                % if loop.first:
+                    class="active"
                 % endif
+              >
+                <a href="#${ obj.config.key }Conf" data-toggle="tab">${ obj.config.key }</a>
+              </li>
             % endfor
-            </ul>
-           </p>
-          </div>
+          </ul>
         </div>
-
-        <div class="card card-home">
-          <h2 class="card-heading simple">${_('Configuration Sections and Variables')}</h2>
-          <div class="card-body">
-            <p>
-              <ul class="nav nav-tabs">
-                % for obj in top_level:
-                  <li
-                    % if loop.first:
-                        class="active"
-                    % endif
-                  >
-                    <a href="#${ obj.config.key }Conf" data-toggle="tab">${ obj.config.key }</a>
-                  </li>
-                % endfor
-              </ul>
-
-              ${showTopLevel(top_level)}
-
-              <br/>
-              <br/>
-              <br/>
-            </p>
-          </div>
+        <div class="span10">
+          ${showTopLevel(top_level)}
         </div>
-
       </div>
+    </div>
 
-        <%def name="showTopLevel(config_obj, depth=0)">
-            <div class="tab-content">
-                % for v in config_obj:
-                    <%
-                        # Don't recurse into private variables.
-                        if v.config.private and not show_private:
-                            continue
-                    %>
-                    <div id="${v.config.key}Conf" class="tab-pane
-                    % if loop.first:
-                        active
-                    % endif
-                    ">
-                    ${ recurse(v, depth + 1) }
-                  </div>
-                % endfor
-            </div>
-        </%def>
-
-        <%def name="recurseList(config_obj, depth=0)">
-          <table class="table table-striped recurse">
-          % for v in config_obj:
-            <%
-              # Don't recurse into private variables.
-              if v.config.private and not show_private:
-                continue
-            %>
-            ${ recurse(v, depth + 1) }
-          % endfor
-          </table>
-        </%def>
-
-        <%def name="recurse(config_obj, depth=0)">
-            <tr>
-             % if depth > 1:
-              <th>
-              % if is_anonymous(config_obj.config.key):
-                <i>(default section)</i>
-              % else:
-                ${ config_obj.config.key }
-              % endif
-              </th>
-             % endif
-             % if depth == 1:
-                <td style="border-top:0">
-             % else:
-                <td>
-             % endif
-              % if isinstance(config_obj, BoundContainer):
-                <p class="dump_config_help"><i>${ config_obj.config.help or _('No help available.') }</i></p>
-                ${ recurseList(config_obj.get().values(), depth + 1) }
-              % else:
-                <p>
-                  % if 'password' in config_obj.config.key:
-                    ${ "*" * 10 }
-                  % else:
-                    ${ str(config_obj.get_raw()).decode('utf-8', 'replace') }
-                  % endif
-                  </p>
-                <p class="dump_config_help"><i>${ config_obj.config.help or _('No help available.') }</i></p>
-                <p class="dump_config_default">${ _('Default:') } <i>${ str(config_obj.config.default).decode('utf-8', 'replace') }</i></p>
-              % endif
-              </td>
-            </tr>
-        </%def>
+    <div class="card card-home" style="margin-top: 50px">
+      <h2 class="card-heading simple">${_('Installed Applications')}</h2>
+      <div class="card-body">
+      % for app in apps:
+        % if app.menu_index != 999:
+          <a href="/${app.display_name}"><span class="badge badge-info">${app.name}</span></a>
+        % else:
+          <span class="badge" title="${ _('This app does not have a UI') }">${app.name}</span>
+        % endif
+      % endfor
+      </div>
+    </div>
 
+  </div>
+
+  <%def name="showTopLevel(config_obj, depth=0)">
+    <div class="tab-content">
+      % for v in config_obj:
+      <%
+          # Don't recurse into private variables.
+          if v.config.private and not show_private:
+              continue
+      %>
+      <div id="${v.config.key}Conf" class="tab-pane
+        % if loop.first:
+            active
+        % endif
+        ">
+        ${ recurse(v, depth + 1) }
+      </div>
+      % endfor
     </div>
+  </%def>
+
+    <%def name="recurseList(config_obj, depth=0)">
+      <table class="table table-striped recurse">
+      % for v in config_obj:
+        <%
+          # Don't recurse into private variables.
+          if v.config.private and not show_private:
+            continue
+        %>
+        ${ recurse(v, depth + 1) }
+      % endfor
+      </table>
+    </%def>
+
+    <%def name="recurse(config_obj, depth=0)">
+        <tr>
+         % if depth > 1:
+          <th>
+          % if is_anonymous(config_obj.config.key):
+            <i>(default section)</i>
+          % else:
+            ${ config_obj.config.key }
+          % endif
+          </th>
+         % endif
+         % if depth == 1:
+            <td style="border-top:0">
+         % else:
+            <td>
+         % endif
+          % if isinstance(config_obj, BoundContainer):
+            %if config_obj.config.help or len(config_obj.get().values()) == 0:
+            <i>${ config_obj.config.help or _('No help available.') }</i>
+            % endif
+            ${ recurseList(config_obj.get().values(), depth + 1) }
+          % else:
+            <code>
+            % if 'password' in config_obj.config.key:
+              ${ "*" * 10 }
+            % else:
+              ${ str(config_obj.get_raw()).decode('utf-8', 'replace') }
+            % endif
+              %if str(config_obj.get_raw()).decode('utf-8', 'replace') == '':
+              &nbsp;
+              %endif
+            </code><br/>
+              %if config_obj.config.help:
+                <i>${ config_obj.config.help or _('No help available.') }</i>
+              %endif
+            <span class="muted">${ _('Default:') } <i>${ str(config_obj.config.default).decode('utf-8', 'replace') }</i></span>
+          % endif
+          </td>
+        </tr>
+    </%def>
+
+</div>
 
 ${ commonfooter(request, messages) | n,unicode }