incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r1443489 - in /incubator/bloodhound/trunk/bloodhound_theme/bhtheme: htdocs/bloodhound.css templates/bh_admin.html templates/bh_admin_milestones.html templates/bh_ticket.html templates/bh_ticket_box.html templates/bloodhound_theme.html
Date Thu, 07 Feb 2013 14:07:47 GMT
Author: matevz
Date: Thu Feb  7 14:07:46 2013
New Revision: 1443489

URL: http://svn.apache.org/viewvc?rev=1443489&view=rev
Log:
#217 - Make Bloodhound's layout responsive (part 2)

Modified:
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_box.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css?rev=1443489&r1=1443488&r2=1443489&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Thu Feb  7 14:07:46
2013
@@ -67,6 +67,10 @@ body {
   display: none
 }
 
+.nav-header-selected {
+  color: #b94a48;
+}
+
 /* @end */
 
 /* @group Heading anchors */
@@ -583,12 +587,6 @@ input[type="submit"].btn.btn-micro {
     margin-top: 5px;
   }
 
-  .ticket .properties div[class*="span"] {
-    float: left;
-    margin-left: 10px;
-    margin-right: 10px;
-  }
-
   #changelog .change .span2 {
     float: left;
   }

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin.html?rev=1443489&r1=1443488&r2=1443489&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin.html Thu Feb  7
14:07:46 2013
@@ -25,18 +25,17 @@
       xmlns:py="http://genshi.edgewall.org/"
       py:strip="">
 
-  <py:def function="admin_nav_list()">
-    <div class="well">
-      <ul class="nav nav-list">
+  <py:def function="admin_nav_list(phone)">
+    <div class="${'btn-group' if phone else 'well'}">
+      <py:if test="phone">
+        <a class="btn btn-large dropdown-toggle" data-toggle="dropdown" href="#">Select
Module&nbsp;&nbsp;<span class="caret"></span></a>
+      </py:if>
+
+      <ul class="nav nav-list${' dropdown-menu' if phone else None}">
         <py:for each="category, panels in groupby(panels, lambda p: p.category)"
             py:with="cat_is_active = category.id == active_cat">
-          <li class="nav-header">
-            <py:choose test="">
-              <span py:when="cat_is_active" class="label label-important">
-                ${category.label}
-              </span>
-              <py:otherwise>${category.label}</py:otherwise>
-            </py:choose>
+          <li class="nav-header${' nav-header-selected' if cat_is_active else None}">
+            ${category.label}
           </li>
           <li py:for="panel in panels" py:with="panel = panel.panel;
                   pan_is_active = cat_is_active and panel.id == active_panel"
@@ -49,10 +48,16 @@
   </py:def>
   <py:def function="admin_function(fix_legacy)">
     <div id="content" class="admin row">
-      <h1>Administration</h1>
-      <div id="tabs" class="span3">
-        ${admin_nav_list()}
+      <h1 class="span12">Administration</h1>
+
+      <div id="tabs" class="span3 hidden-phone">
+        ${admin_nav_list(False)}
       </div>
+
+      <div class="span9 visible-phone">
+        ${admin_nav_list(True)}
+      </div>
+
       <div id="tabcontent" class="span9">
         <py:choose>
         <py:when test="fix_legacy">

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html?rev=1443489&r1=1443488&r2=1443489&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
Thu Feb  7 14:07:46 2013
@@ -36,7 +36,7 @@
   </head>
 
   <body>
-    <h2>Manage Milestones</h2>
+    <h2>Milestone Management</h2>
 
     <py:choose test="view">
       <form py:when="'detail'" class="well form-horizontal" method="post" 
@@ -108,10 +108,13 @@
 
       <py:otherwise>
         <div class="row">
-          <div class="${'MILESTONE_CREATE' in req.perm and 'span6' or 'span9'}">
+          <div class="span9">
             <py:choose>
-              <form id="milestone_table" method="post" action=""
+              <form id="milestone_table" method="post" action="" class="well"
                     py:when="milestones" py:with="can_remove = 'MILESTONE_DELETE' in req.perm">
+      
+                <legend>Modify Milestones</legend>
+
                 <table id="millist"
                     class="table table-bordered table-striped table-condensed">
                     
@@ -161,24 +164,39 @@
               </p>
             </py:choose>
           </div>
-          <div class="span3" py:if="'MILESTONE_CREATE' in req.perm">
-            <form class="well" id="addmilestone" method="post" action="">
+        </div>
+
+        <div py:if="'MILESTONE_CREATE' in req.perm" class="row">
+          <div class="span9">
+            <form class="well form-horizontal" id="addmilestone" method="post" action="">
               <fieldset>
-                <legend>Add Milestone:</legend>
-                <label for="name">Name:</label>
-                <input class="input-medium" type="text" name="name"
-                    id="name" size="22" />
-                <label for="duedate">Due:</label>
-                <input class="input-medium" type="text" id="duedate"
-                    name="duedate" size="${len(datetime_hint)}"
-                    placeholder="${_('Format: %(datehint)s', datehint=datetime_hint)}" />
-                <p class="help-block">
-                  <span class="label label-info">Hint</span>
-                  <i18n:msg params="datehint">Format: $datetime_hint</i18n:msg>
-                </p>
+                <legend>Add Milestone</legend>
+                <div class="control-group">
+                  <label class="control-label" for="name">Milestone Name</label>
+                  <div class="controls">
+                    <input type="text" name="name" id="name" class="input-xlarge" />
+                  </div>
+                </div>
+
+                <div class="control-group">
+                  <label class="control-label" for="duedate">Due Date</label>
+                  <div class="controls">
+                    <input type="text" id="duedate"
+                        name="duedate" size="${len(datetime_hint)}"
+                        class="input-xlarge"
+                        placeholder="${_('Format: %(datehint)s', datehint=datetime_hint)}"
/>
+                  </div>
+                </div>
+
                 <div class="control-group">
-                  <input class="btn" type="submit" name="add"
-                      value="${_('Add')}" />
+                  <div class="controls">
+                    <input class="btn" type="submit" name="add" value="${_('Add')}" />
+                  </div>
+
+                  <p class="help-block">
+                    <span class="label label-info">Hint</span>
+                    <i18n:msg params="datehint">Format: $datetime_hint</i18n:msg>
+                  </p>
                 </div>
               </fieldset>
             </form>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html?rev=1443489&r1=1443488&r2=1443489&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html Thu Feb 
7 14:07:46 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>
@@ -337,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/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_box.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_box.html?rev=1443489&r1=1443488&r2=1443489&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_box.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_box.html Thu Feb
 7 14:07:46 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}">

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html?rev=1443489&r1=1443488&r2=1443489&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html Thu
Feb  7 14:07:46 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>



Mime
View raw message