incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r1445304 - in /incubator/bloodhound/trunk: bloodhound_dashboard/bhdashboard/templates/bh_model_view.html bloodhound_dashboard/bhdashboard/widgets/templates/widget_progress.html bloodhound_theme/bhtheme/htdocs/bloodhound.css
Date Tue, 12 Feb 2013 18:37:24 GMT
Author: matevz
Date: Tue Feb 12 18:37:23 2013
New Revision: 1445304

URL: http://svn.apache.org/r1445304
Log:
#368 - Milestone sticky panel broken @ r1442618

Modified:
    incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html
    incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_progress.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css

Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html?rev=1445304&r1=1445303&r2=1445304&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html
Tue Feb 12 18:37:23 2013
@@ -27,15 +27,26 @@
       xmlns:bh="http://issues.apache.org/bloodhound/wiki/Ui/Dashboard"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       py:strip=""
-      py:with="colspan = 'span8' if bhdb else 'span12'">
+      py:with="colspan = 'span8';
+               cols_activity = 'span4'">
+
+  <!--! hack for hiding the activity feed title in desktop/tablet landscape mode (the
title is part of the sticky) -->
+  <style>
+    @media (min-width: 768px) {
+      #activity h3 { display: none !important; }
+    }
+    @media (max-width: 767px) {
+      #activity h3 { display: inherit !important; }
+    }
+  </style>
+  <script type="text/javascript" src="${href.chrome('dashboard/js/bloodhound-stickyscroll.js')}"></script>
   <xi:include href="widget_macros.html" />
 
-  <div class="$colspan">
-    <div class="stickyBox">
-      <div id="overview" class="stickyStatus $colspan">
-        <div class="whitebox"></div>
+  <div id="stickyStatus" class="span12">
+    <div class="row">
+      <div class="$colspan">
         $heading
-        <br/>
+
         <py:choose>
           <py:when test="progress_data">
             <xi:include href="widget_progress.html"
@@ -44,32 +55,34 @@
                     interval_hrefs = progress_data.interval_hrefs;
                     " />
           </py:when>
-          <py:when test="ticket_query">
-            <bh:widget urn="TicketGroupStats">
-              <bh:args>
-                <bh:arg name="query">$ticket_query</bh:arg>
-                <bh:arg name="view">compact</bh:arg>
-              </bh:args>
-            </bh:widget>
-          </py:when>
         </py:choose>
-        <div class="stickyEndMark"></div>
       </div>
-    </div>
-    <script type="text/javascript">
-      setup_sticky_panel('#overview');
-    </script>
-    <div class="${'span7' if bhdb else 'span11'}" >
-      <div class="well">
-        $description
-        $buttons
+      <div class="$cols_activity hidden-phone">
+        <h2>${_('Activity')}</h2>
       </div>
     </div>
-    <div>
-      $widgets
+  </div>
+
+  <div class="$colspan">
+    <div py:if="ticket_query" id="overview">
+      <bh:widget urn="TicketGroupStats">
+        <bh:args>
+          <bh:arg name="query">$ticket_query</bh:arg>
+          <bh:arg name="view">compact</bh:arg>
+        </bh:args>
+      </bh:widget>
+    </div>
+
+    <div py:if="description" class="well">
+      $description
     </div>
+
+    $buttons
+    $widgets
   </div>
-  <div py:if="bhdb" class="span4">
+
+  <div py:if="bhdb" id="activity" class="$cols_activity">
+    <div class="visible-phone" id="mobile-activity"></div>
     <bh:widget urn="Timeline">
       <bh:args py:if="resource_realm and resource_id">
         <bh:arg name="realm">$resource_realm</bh:arg>
@@ -78,3 +91,4 @@
     </bh:widget>
   </div>
 </div>
+

Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_progress.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_progress.html?rev=1445304&r1=1445303&r2=1445304&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_progress.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_progress.html
Tue Feb 12 18:37:23 2013
@@ -81,13 +81,13 @@
       </p>
     </py:when>
     <py:when test="'compact'">
-      <div class="span3">
+      <div class="span3 compact-left">
         <p style="margin-bottom: -2px">${progress_percent()}</p>
         ${progress_bar()}
         <p style="margin-top: -12px">${progress_total()}</p>
       </div>
-      <div class="offset3">
-        <div py:for="idx, interval in enumerate(stats.intervals)" class="span2">
+      <div class="offset3 compact-left">
+        <div py:for="idx, interval in enumerate(stats.intervals)" class="span2 compact-left">
           <p style="margin-bottom: -2px; text-transform: capitalize">
             ${interval.title}
           </p>

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=1445304&r1=1445303&r2=1445304&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Tue Feb 12 18:37:23
2013
@@ -607,6 +607,11 @@ input[type="submit"].btn.btn-micro {
   #changelog .change .span2 {
     float: left;
   }
+
+  .compact-left {
+    float: left;
+    margin-left: 10px;
+  }
 }
 
 @media (max-width: 480px) {



Mime
View raw message