incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1444754 [2/2] - in /incubator/bloodhound/branches/bep_0003_multiproduct: ./ bloodhound_dashboard/ bloodhound_multiproduct/ bloodhound_search/ bloodhound_search/bhsearch/ bloodhound_search/bhsearch/search_resources/ bloodhound_search/bhsear...
Date Mon, 11 Feb 2013 13:05:19 GMT
Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html?rev=1444754&r1=1444753&r2=1444754&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
Mon Feb 11 13:05:18 2013
@@ -32,40 +32,40 @@
   <body>
     <h2>Manage Repositories</h2>
 
-    <py:def function="type_field(editable, selected=None)">
-      <div class="control-group">
-        <label class="control-label" for="trac-typetype">Type:</label>
-        <div class="controls">
-          <select class="input-medium" size="1" id="trac-type" name="type"
-              disabled="${not editable or None}">
-            <option py:for="type in types" value="$type" selected="${type == selected
or None}">${type or _('(default)')}</option>
-            <option py:if="selected and selected not in types" selected="selected">$selected</option>
-          </select>
-          <p class="help-block">
-            <span class="label label-info">Default</span> $default_type
-          </p>
+    <py:def function="type_field(editable, inline=False, selected=None)">
+        <div class="control-group" py:strip="inline">
+          <label class="control-label" for="trac-type">Type:</label>
+          <div class="controls" py:strip="inline">
+            <select class="input-medium" size="1" id="trac-type" name="type"
+                    disabled="${not editable or None}">
+              <option py:for="type in types" value="$type" selected="${type == selected
or None}">${type or _('(default)')}</option>
+              <option py:if="selected and selected not in types" selected="selected">$selected</option>
+            </select>
+            <p class="help-inline" >
+              <span class="label label-info">Default</span> $default_type
+            </p>
+          </div>
         </div>
-      </div>
     </py:def>
 
-    <py:def function="alias_field(editable, selected=None)">
-      <div class="control-group">
-        <label class="control-label" for="trac-repository">Repository:</label>
-        <div class="controls">
-          <select class="input-medium" size="1" id="trac-repository"
-              name="alias" disabled="${not editable or None}">
-            <option py:for="(reponame, info) in sorted(repositories.iteritems())" py:if="not
info.alias"
-                    value="$info.name" selected="${info.name == selected or None}">${info.name
or _('(default)')}</option>
-            <option py:if="selected is not None and selected not in repositories" selected="selected">$selected</option>
-          </select>
+    <py:def function="alias_field(editable, inline=False, selected=None)">
+        <div class="control-group" py:strip="inline">
+          <label class="control-label" for="trac-repository">Repository:</label>
+          <div class="controls" py:strip="inline">
+            <select class="input-medium" size="1" id="trac-repository"
+                    name="alias" disabled="${not editable or None}">
+              <option py:for="(reponame, info) in sorted(repositories.iteritems())" py:if="not
info.alias"
+                      value="$info.name" selected="${info.name == selected or None}">${info.name
or _('(default)')}</option>
+              <option py:if="selected is not None and selected not in repositories" selected="selected">$selected</option>
+            </select>
+          </div>
         </div>
-      </div>
     </py:def>
 
     <py:choose test="view">
       <form py:when="'detail'" py:with="info = repositories[reponame]"
-          class="well form-horizontal" id="trac-modrepos" method="post"
-          action="">
+            class="well form-horizontal" id="trac-modrepos" method="post"
+            action="">
         <fieldset py:choose="" py:with="readonly = not info.editable or None">
           <legend py:when="info.editable">Modify Repository:</legend>
           <legend py:otherwise="">View Repository:</legend>
@@ -78,27 +78,27 @@
             <label class="control-label" for="name">Name:</label>
             <div class="controls">
               <input type="text" id="name" name="name" value="$info.name"
-                  readonly="$readonly"/>
+                     readonly="$readonly"/>
             </div>
           </div>
           <py:choose>
             <py:when test="'alias' in info">
-              ${alias_field(info.editable, info.alias)}
+              ${alias_field(info.editable, selected=info.alias)}
             </py:when>
             <py:otherwise>
-              ${type_field(info.editable, info.type)}
+                ${type_field(info.editable, selected=info.type)}
               <div class="control-group">
                 <label class="control-label" for="dir">Directory:</label>
                 <div class="controls">
                   <input type="text" id="dir" name="dir" size="48"
-                      value="$info.dir" readonly="$readonly"/>
+                         value="$info.dir" readonly="$readonly"/>
                 </div>
               </div>
               <div class="control-group">
                 <label class="control-label" for="url">URL:</label>
                 <div class="controls">
                   <input type="text" id="url" name="url" size="48"
-                      value="$info.url" readonly="$readonly"/>
+                         value="$info.url" readonly="$readonly"/>
                 </div>
               </div>
             </py:otherwise>
@@ -106,7 +106,7 @@
           <div class="control-group">
             <div class="controls">
               <input type="checkbox" name="hidden" value="1"
-                  checked="${info.hidden or None}" disabled="$readonly"/>
+                     checked="${info.hidden or None}" disabled="$readonly"/>
               Hide from repository index
             </div>
           </div>
@@ -117,8 +117,8 @@
               </label>
              <div class="controls">
                 <textarea id="description" name="description" class="wikitext trac-resizable"
-                    placeholder="Describe this repository using WikiFormatting"
-                    rows="6" cols="60" readonly="$readonly">$info.description</textarea>
+                          placeholder="Describe this repository using WikiFormatting"
+                          rows="6" cols="60" readonly="$readonly">$info.description</textarea>
                 <p class="help-block">
                   <span class="label label-info">Tip</span>
                   you may use <a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a>
here
@@ -129,22 +129,55 @@
           <div class="control-group">
             <input class="btn" type="submit" name="cancel" value="${_('Cancel')}"/>
             <input class="btn" py:if="info.editable" type="submit"
-                name="save" value="${_('Save')}"/>
+                   name="save" value="${_('Save')}"/>
           </div>
         </fieldset>
       </form>
 
       <py:otherwise>
         <div class="row">
-          <div class="span6">
-    
+          <div class="span9">
+            <form class="well form-inline" id="trac-addrepos" method="post" action="">
+              <fieldset>
+                <legend>Add Repository:</legend>
+                <div class="control-group">
+                  <label class="control-label" for="name">Name:</label>
+                  <input class="input-medium" type="text" id="name" name="name"/>
+                  ${type_field(True, True)}
+                </div>
+                <div class="control-group">
+                  <label for="dir">Directory:</label>
+                  <input class="input-xxlarge" type="text" id="dir" name="dir"/>
+                </div>
+                <div class="control-group">
+                  <input class="btn" type="submit" name="add_repos"
+                         value="${_('Add')}"/>
+                </div>
+              </fieldset>
+            </form>
+            <form py:if="any(not info.alias for info in repositories.itervalues())"
+                  class="well form-inline" id="trac-addalias" method="post" action="">
+              <fieldset>
+                <legend>Add Alias:</legend>
+                <div class="control-group">
+                  <label for="alias_name">Name:</label>
+                  <input class="input-medium" type="text" id="alias_name"
+                         name="name"/>
+                  ${alias_field(True, True)}
+                </div>
+                <div class="control-group">
+                  <input class="btn" type="submit" name="add_alias"
+                         value="${_('Add')}"/>
+                </div>
+              </fieldset>
+            </form>
             <form id="trac-repository_table" method="post" action="">
               <table id="trac-reposlist"
                   class="table table-striped table-condensed table-bordered">
                 <thead>
                   <tr><th class="sel"><i class="icon-check"></i></th>
                     <th>Name</th><th>Type</th>
-                    <th class="full-x">Directory</th><th>Revision</th>
+                    <th>Directory</th><th>Revision</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -164,43 +197,12 @@
               </table>
               <div class="control-group">
                 <input class="btn" type="submit" name="refresh"
-                    value="${_('Refresh')}"/>
+                       value="${_('Refresh')}"/>
                 <input class="btn" type="submit" name="remove"
-                    value="${_('Remove selected items')}"/>
+                       value="${_('Remove selected items')}"/>
               </div>
             </form>
           </div>
-          <div class="span3">
-            <form class="well" id="trac-addrepos" method="post" action="">
-              <fieldset>
-                <legend>Add Repository:</legend>
-                <label for="name">Name:</label>
-                <input class="input-medium" type="text" id="name" name="name"/>
-                ${type_field(True)}
-                <label for="dir">Directory:</label>
-                <input class="input-medium" type="text" id="dir" name="dir"/>
-                <div class="control-group">
-                  <input class="btn" type="submit" name="add_repos"
-                      value="${_('Add')}"/>
-                </div>
-              </fieldset>
-            </form>
-
-            <form py:if="any(not info.alias for info in repositories.itervalues())"
-                  class="well" id="trac-addalias" method="post" action="">
-              <fieldset>
-                <legend>Add Alias:</legend>
-                <label for="alias_name">Name:</label>
-                <input class="input-medium" type="text" id="alias_name" 
-                    name="name"/>
-                ${alias_field(True)}
-                <div class="control-group">
-                  <input class="btn" type="submit" name="add_alias"
-                      value="${_('Add')}"/>
-                </div>
-              </fieldset>
-            </form>
-          </div>
         </div>
 
       </py:otherwise>

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_search.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_search.html?rev=1444754&r1=1444753&r2=1444754&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_search.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_search.html
Mon Feb 11 13:05:18 2013
@@ -41,27 +41,31 @@
   </head>
   <body>
     <div id="content" class="row">
-
-      <h2 py:if="results">
-        Results <small>(${results.displayed_items()})</small>
-      </h2>
-
-      <form id="fullsearch" action="${href.search()}" method="get">
-        <input type="hidden" name="q" value="${query}" />
-        <input type="hidden" name="noquickjump" value="1" />
-        <div class="span2">
-          <input class="btn" type="submit" value="${_('Apply filters')}" />
-        </div>
-        <div class="span10 filters">
-          <py:for each="filter in filters">
-            <input type="checkbox" id="${filter.name}" name="${filter.name}"
-                   checked="${filter.active or None}" />
-            <label for="${filter.name}">
-              <span class="label">${filter.label}</span>
-            </label>
-          </py:for>
-        </div>
-      </form>
+      <div class="span12">
+        <h2 py:if="results">
+          Results <small>(${results.displayed_items()})</small>
+        </h2>
+
+        <form id="fullsearch" action="${href.search()}" method="get">
+          <input type="hidden" name="q" value="${query}" />
+          <input type="hidden" name="noquickjump" value="1" />
+
+          <div class="row">
+            <div class="span2">
+              <input class="btn" type="submit" value="${_('Apply filters')}" />
+            </div>
+            <div class="span10 filters">
+              <py:for each="filter in filters">
+                <input type="checkbox" id="${filter.name}" name="${filter.name}"
+                       checked="${filter.active or None}" />
+                <label for="${filter.name}">
+                  <span class="label">${filter.label}</span>
+                </label>
+              </py:for>
+            </div>
+          </div>
+        </form>
+      </div>
 
       <div class="span12" py:if="results or quickjump">
         <div>

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket.html?rev=1444754&r1=1444753&r2=1444754&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket.html
Mon Feb 11 13:05:18 2013
@@ -49,7 +49,6 @@
         #activity h3 { display: inherit !important; }
       }
     </style>
-    <meta py:if="responsive_layout" name="viewport" content="width=device-width, initial-scale=1.0"
/>
     <title py:choose="">
       <py:when test="ticket.exists">#${ticket.id} (${ticket.summary})</py:when>
       <py:otherwise>New Ticket</py:otherwise>
@@ -301,13 +300,6 @@
                     </py:otherwise>
 
                     <span class="ticket-info">
-<!--!
-                      <span id="h_reporter"> - Reported by
-                        <span id="vc-reporter" data-edit="${'inplace' if only_for_admin
else None}">
-                          ${reporter_link if defined('reporter_link') else authorinfo(ticket.reporter)},
-                        </span>
-                      </span>
--->
                       <span id="h_owner">Assigned to
                         ${(owner_link if defined('owner_link') else authorinfo(ticket.owner))
if ticket.owner else ''}
                       </span>
@@ -344,8 +336,9 @@
                     <div class="span4">
                       <div class="row">
                         <div class="span2">
-                          <h5 id="h_reporter" class="pull-right">
-                            Reporter:
+                          <h5 id="h_reporter">
+                            <span class="hidden-phone pull-right">Reporter:</span>
+                            <span class="visible-phone">Reporter:</span>
                           </h5>
                         </div>
                         <div class="span2" id="vc-reporter" data-edit="${'inplace' if
only_for_admin else None}">

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_box.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_box.html?rev=1444754&r1=1444753&r2=1444754&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_box.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_box.html
Mon Feb 11 13:05:18 2013
@@ -42,8 +42,15 @@ Arguments:
         <div class="span4">
           <div class="row">
             <div class="span2">
-              <h5 id="${'h_' + field.name if field else None}" class="pull-right">
-                <py:if test="field"><i18n:msg params="field">${field.label or
field.name}:</i18n:msg></py:if>
+              <h5 id="${'h_' + field.name if field else None}">
+                <py:if test="field">
+                  <span class="hidden-phone pull-right">
+                    <i18n:msg params="field">${field.label or field.name}:</i18n:msg>
+                  </span>
+                  <span class="visible-phone">
+                    <i18n:msg params="field">${field.label or field.name}:</i18n:msg>
+                  </span>
+                </py:if>
               </h5>
             </div>
             <div class="span2" data-edit="${'inplace' if (field and field.name != 'status')
else None}" id="${'vc-' + field.name if field else None}">
@@ -125,7 +132,7 @@ Arguments:
 
     <div class="properties">
       <py:for each="_fields, count in 
-          [(text_fields, _colcount / 2), (area_fields, colspan, 1)]">
+          [(text_fields, _colcount / 2), (area_fields, 1)]">
         <div py:for="fields_row in group(_fields, count)" class="row">
           ${render_fields_row(fields_row, None, False)}
         </div>

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bloodhound_theme.html?rev=1444754&r1=1444753&r2=1444754&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
Mon Feb 11 13:05:18 2013
@@ -28,6 +28,7 @@
   <py:match path="head" once="true"><head>
     <link rel="stylesheet" href="${href.chrome('dashboard/css/bootstrap.css')}" type="text/css"
/>
     <link rel="stylesheet" href="${href.chrome('dashboard/css/bootstrap-responsive.css')}"
type="text/css" />
+    <meta py:if="responsive_layout" name="viewport" content="width=device-width, initial-scale=1.0"
/>
     <title py:with="title = list(select('title/text()'))" py:choose="">
       <py:when test="title">${title}</py:when>
       <py:otherwise>${project.name or 'Apache(TM) Bloodhound'}</py:otherwise>
@@ -214,7 +215,7 @@
           <!--! main navigation tabs -->
           <div class="span6">
             <ul py:if="chrome.nav.mainnav or chrome.nav.metanav"
-                class="nav nav-tabs pull-right hidden-phone"
+                class="nav nav-tabs pull-right"
                 id="mainnav"
                 py:with="mainnav_show = ('wiki', 'tickets', 'browser');
                          metanav_hide = ('login', 'logout', 'prefs', 'help', 'about')">

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py?rev=1444754&r1=1444753&r2=1444754&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py
Mon Feb 11 13:05:18 2013
@@ -258,7 +258,7 @@ class BloodhoundTheme(ThemeBase):
                 modifier = getattr(self, modifier)
                 modifier(req, template, data, content_type, is_active_theme)
 
-        if is_active_theme:
+        if is_active_theme and data is not None:
             data['responsive_layout'] = self.env.config.getbool(
                     'bloodhound', 'responsive_layout', 'true')
 

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py?rev=1444754&r1=1444753&r2=1444754&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py (original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py Mon Feb
11 13:05:18 2013
@@ -24,8 +24,10 @@ import sys
 setup(
   name = 'BloodhoundTheme',
   version = '0.4.0',
-  description = "Look and feel of Bloodhound issue tracker",
+  description = "Theme for Apache(TM) Bloodhound.",
+  author = "Apache Bloodhound",
   license = "Apache License v2",
+  url = "http://incubator.apache.org/bloodhound/",
   keywords = "trac plugin theme bloodhound",
   packages = ['bhtheme'],
   package_data = {'bhtheme': ['htdocs/*.*', 'htdocs/img/*.*',



Mime
View raw message