whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sam Ruby <ru...@apache.org>
Subject [whimsy.git] [1/1] Commit 8ff058c: move info box to second column on wide displays
Date Tue, 15 Mar 2016 21:15:21 GMT
Commit 8ff058cc15cd1413092e258c6e1a9277545908c7:
    move info box to second column on wide displays


Branch: refs/heads/master
Author: Sam Ruby <rubys@intertwingly.net>
Committer: Sam Ruby <rubys@intertwingly.net>
Pusher: rubys <rubys@apache.org>

------------------------------------------------------------
www/board/agenda/public/stylesheets/app.css                  | ++++++++ 
www/board/agenda/views/app.js.rb                             | + 
www/board/agenda/views/layout/header.js.rb                   | + -----------
www/board/agenda/views/pages/report.js.rb                    | +++++ 
------------------------------------------------------------
65 changes: 24 additions, 41 deletions.
------------------------------------------------------------


diff --git a/www/board/agenda/public/stylesheets/app.css b/www/board/agenda/public/stylesheets/app.css
index 1d1871e..faaae1c 100644
--- a/www/board/agenda/public/stylesheets/app.css
+++ b/www/board/agenda/public/stylesheets/app.css
@@ -267,6 +267,10 @@ footer button {
   margin-bottom: 1em;
 }
 
+.flexbox .report-info {
+  display: none;
+}
+
 @media only screen and (min-width: 1200px) {
   .flexbox {
     display: flex;
@@ -278,6 +282,18 @@ footer button {
     justify-content: flex-start;
     min-width: 48%;
   }
+
+  .navbar .report-info {
+    display: none
+  }
+
+  .flexbox .report-info {
+    display: block;
+  }
+
+  .flexbox .report-info .dl-horizontal {
+    margin-left: -3em;
+  }
 }
 
 /* Make dropdowns have the right cursor */
diff --git a/www/board/agenda/views/app.js.rb b/www/board/agenda/views/app.js.rb
index 0dbb662..ce24e8d 100644
--- a/www/board/agenda/views/app.js.rb
+++ b/www/board/agenda/views/app.js.rb
@@ -48,6 +48,7 @@
 require_relative 'elements/link'
 require_relative 'elements/modal-dialog'
 require_relative 'elements/text'
+require_relative 'elements/info'
 
 # Model
 require_relative 'models/events'
diff --git a/www/board/agenda/views/layout/header.js.rb b/www/board/agenda/views/layout/header.js.rb
index 9522bc4..b5a882d 100644
--- a/www/board/agenda/views/layout/header.js.rb
+++ b/www/board/agenda/views/layout/header.js.rb
@@ -28,52 +28,13 @@ def render
         # 'info'/'online' dropdown
         #
         if @@item.attach
-          _li.dropdown class: @infodropdown do
+          _li.report_info.dropdown class: @infodropdown do
             _a.dropdown_toggle.info! onClick: self.toggleInfo do
               _ 'info'
               _b.caret
             end
 
-            _dl.dropdown_menu.dl_horizontal do
-              _dt 'Attach'
-              _dd @@item.attach
-
-              if @@item.owner
-                _dt 'Author'
-                _dd @@item.owner
-              end
-
-              if @@item.shepherd
-                _dt 'Shepherd'
-                _dd @@item.shepherd
-              end
-
-              if @@item.flagged_by and not @@item.flagged_by.empty?
-                _dt 'Flagged By'
-                _dd @@item.flagged_by.join(', ')
-              end
-
-              if @@item.approved and not @@item.approved.empty?
-                _dt 'Approved By'
-                _dd @@item.approved.join(', ')
-              end
-
-              if @@item.roster or @@item.prior_reports or @@item.stats
-                _dt 'Links'
-
-                if @@item.roster
-                  _dd { _a 'Roster', href: @@item.roster }
-                end
-
-                if @@item.prior_reports
-                  _dd { _a 'Prior Reports', href: @@item.prior_reports }
-                end
-
-                if @@item.stats
-                  _dd { _a 'Statistics', href: @@item.stats }
-                end
-              end
-            end
+            _Info item: @@item, position: 'dropdown-menu'
           end
 
         elsif @@item.online
diff --git a/www/board/agenda/views/pages/report.js.rb b/www/board/agenda/views/pages/report.js.rb
index 223a2ed..8d4ac71 100644
--- a/www/board/agenda/views/pages/report.js.rb
+++ b/www/board/agenda/views/pages/report.js.rb
@@ -47,6 +47,11 @@ def render
 
       _section do
         _AdditionalInfo item: @@item
+
+        _div.report_info do
+          _h4 'Report Info'
+          _Info item: @@item
+        end
       end
     end
   end

Mime
View raw message