svn commit: r1455428 - in /incubator/bloodhound/trunk/bloodhound_theme/bhtheme: templates/bh_prefs_language.html templates/bh_prefs_userinterface.html theme.py

[rj...@apache.org]

Author: rjollos
Date: Tue Mar 12 07:35:50 2013
New Revision: 1455428

URL: http://svn.apache.org/r1455428
Log:
Refs #453: Added Bootstrap templates for `prefs_userinterface.html` and `prefs_language.html`. The //userinterface// template had been added to Trac in [trac 11129] (i.e. after Trac was imported to the Bloodhound repository), therefore this is part of the work towards #453.

More work needs to be done towards uniform styling of the preference panels. For example, the ''Keyboard Shortcuts'' and ''User Interface'' panels have similar elements and structure, but look significantly different at this time. They can be compared to determine what styles might be better to adopt going forward.

Added:
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_language.html
      - copied, changed from r1455062, incubator/bloodhound/trunk/trac/trac/prefs/templates/prefs_language.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html
      - copied, changed from r1455062, incubator/bloodhound/trunk/trac/trac/prefs/templates/prefs_userinterface.html
Modified:
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py

Copied: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_language.html (from r1455062, incubator/bloodhound/trunk/trac/trac/prefs/templates/prefs_language.html)
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_language.html?p2=incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_language.html&p1=incubator/bloodhound/trunk/trac/trac/prefs/templates/prefs_language.html&r1=1455062&r2=1455428&rev=1455428&view=diff
==============================================================================
--- incubator/bloodhound/trunk/trac/trac/prefs/templates/prefs_language.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_language.html Tue Mar 12 07:35:50 2013
@@ -5,7 +5,7 @@
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       xmlns:i18n="http://genshi.edgewall.org/i18n">
-  <xi:include href="prefs.html" />
+  <xi:include href="bh_prefs.html" />
   <head>
     <title>Language</title>
   </head>

Copied: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html (from r1455062, incubator/bloodhound/trunk/trac/trac/prefs/templates/prefs_userinterface.html)
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html?p2=incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html&p1=incubator/bloodhound/trunk/trac/trac/prefs/templates/prefs_userinterface.html&r1=1455062&r2=1455428&rev=1455428&view=diff
==============================================================================
--- incubator/bloodhound/trunk/trac/trac/prefs/templates/prefs_userinterface.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html Tue Mar 12 07:35:50 2013
@@ -5,32 +5,36 @@
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:i18n="http://genshi.edgewall.org/i18n"
       xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="prefs.html" />
+  <xi:include href="bh_prefs.html" />
   <head>
     <title>User Interface</title>
   </head>
   <body>
 
-    <div class="field">
-      <input type="hidden" name="ui.use_symbols_cb" value="" />
-      <label>
-        <input type="checkbox" name="ui.use_symbols" value="1"
-               checked="${settings.session.get('ui.use_symbols') or None}" />
-        Use only symbols for buttons.
-      </label>
-      <p class="hint" i18n:msg="">Display only the icon or symbol for
-      short inline buttons, and hide the text caption.</p>
+    <div class="field control-group">
+      <div class="controls">
+        <input type="hidden" name="ui.use_symbols_cb" value="" />
+        <label>
+          <input type="checkbox" class="checkbox" name="ui.use_symbols" value="1"
+                 checked="${settings.session.get('ui.use_symbols') or None}" />
+          Use only symbols for buttons.
+        </label>
+        <p class="hint help-block" i18n:msg=""><span class="label label-info">Note</span>
+        Display only the icon or symbol for short inline buttons, and hide the text caption.</p>
+      </div>
     </div>
 
-    <div class="field">
-      <input type="hidden" name="ui.hide_help_cb" value="" />
-      <label>
-        <input type="checkbox" name="ui.hide_help" value="1"
-               checked="${settings.session.get('ui.hide_help') or None}" />
-        Hide help links.
-      </label>
-      <p class="hint" i18n:msg="">Don't show the various help links.
-      This reduces the verbosity of the pages.</p>
+    <div class="field control-group">
+      <div class="controls">
+        <input type="hidden" name="ui.hide_help_cb" value="" />
+        <label>
+          <input type="checkbox" class="checkbox" name="ui.hide_help" value="1"
+                 checked="${settings.session.get('ui.hide_help') or None}" />
+          Hide help links.
+        </label>
+        <p class="hint help-block" i18n:msg=""><span class="label label-info">Note</span>
+        Don't show the various help links. This reduces the verbosity of the pages.</p>
+      </div>
     </div>
 
   </body>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py?rev=1455428&r1=1455427&r2=1455428&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py Tue Mar 12 07:35:50 2013
@@ -79,11 +79,14 @@ class BloodhoundTheme(ThemeBase):
         'admin_products.html' : ('bh_admin_products.html', None),
 
         # Preferences
+        'prefs.html' : ('bh_prefs.html', None),
         'prefs_advanced.html' : ('bh_prefs_advanced.html', None),
         'prefs_datetime.html' : ('bh_prefs_datetime.html', None),
         'prefs_general.html' : ('bh_prefs_general.html', None),
+        'prefs_language.html' : ('bh_prefs_language.html', None),
         'prefs_keybindings.html' : ('bh_prefs_keybindings.html', None),
         'prefs_pygments.html' : ('bh_prefs_pygments.html', None),
+        'prefs_userinterface.html' : ('bh_prefs_userinterface.html', None),
 
         # Search
         'search.html' : ('bh_search.html', '_modify_search_data'),