use page header in more places

luarocks · Sep 1, 2018 · ef38314 · ef38314
1 parent 9b0e6d7
commit ef38314
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 26 deletions.
diff --git a/static/scss/widgets/page_header.scss b/static/scss/widgets/page_header.scss
@@ -34,10 +34,20 @@
     box-sizing: border-box;
 }
 
+.page_header_inner, > h1 {
+    &:last-child {
+        margin-bottom: 20px;
+    }
+}
+
 .page_header_inner {
     display: flex;
     align-items: center;
 
+    h1, p {
+        margin: 0;
+    }
+
     > * {
         margin-right: 10px;
         &:last-child {
@@ -56,10 +66,6 @@
     }
 }
 
-h1, p {
-    margin: 0;
-}
-
 h1 {
     font-size: 32px;
 
@@ -87,7 +93,7 @@ h1 {
     }
 
     // for logged in and logged out
-    .button {
+    button, .button {
         display: inline-flex;
         align-items: center;
         padding: 0 20px;

diff --git a/views/dependency_stats.moon b/views/dependency_stats.moon
@@ -6,9 +6,10 @@ class DependencyStats extends require "widgets.page"
     "top_depended"
   }
 
-  inner_content: =>
+  header_content: =>
     widget Header page_name: "dependencies"
 
+  inner_content: =>
     h3 "Top depended upon modules"
 
     element "table", class: "table", ->

diff --git a/views/popular_this_week.moon b/views/popular_this_week.moon
@@ -7,6 +7,9 @@ class PopularThisWeek extends require "widgets.page"
     "top_new_versions"
   }
 
+  header_content: =>
+    widget Header page_name: "this_week"
+
   render_tuples: (tuples) =>
     element "table", class: "table", ->
       thead ->
@@ -36,7 +39,6 @@ class PopularThisWeek extends require "widgets.page"
             a class: "author sub", href: @url_for(user), user\name_for_display!
 
   inner_content: =>
-    widget Header page_name: "this_week"
 
     h3 "Top Lua modules this week"
     p "Top downloaded versions in the past #{@days} days."

diff --git a/views/stats.moon b/views/stats.moon
@@ -8,6 +8,9 @@ class Stats extends require "widgets.page"
     "cumulative_modules"
   }
 
+  header_content: =>
+    widget Header page_name: "this_week"
+
   js_init: =>
     data = {
       graphs: {
@@ -20,8 +23,6 @@ class Stats extends require "widgets.page"
     "M.Stats(#{@widget_selector!}, #{to_json data});"
 
   inner_content: =>
-    widget Header page_name: "global"
-
     h3 "Cumulative modules"
     div id: "cumulative_modules", class: "graph_container"
 

diff --git a/views/upload_rock.moon b/views/upload_rock.moon
@@ -1,15 +1,20 @@
+PageHeader = require "widgets.page_header"
 
 class UploadRock extends require "widgets.page"
   @needs: {
     "version"
   }
 
-  inner_content: =>
-    h2 ->
-      text "Upload Rock For "
-      a href: @url_for(@version),
-        "#{@module\name_for_display!} #{@version.version_name}"
+  header_content: =>
+    widget PageHeader {
+      inner_content: ->
+        h1 ->
+          text "Upload Rock For "
+          a href: @url_for(@version),
+            "#{@module\name_for_display!} #{@version.version_name}"
+    }
 
+  inner_content: =>
     @render_errors!
 
     if @version.development

diff --git a/views/upload_rockspec.moon b/views/upload_rockspec.moon
@@ -1,6 +1,13 @@
+PageHeader = require "widgets.page_header"
+
 class UploadRockspec extends require "widgets.page"
+  header_content: =>
+    widget PageHeader {
+      inner_content: ->
+        h1 "Upload Rockspec"
+    }
+
   inner_content: =>
-    h2 "Upload Rockspec"
     @render_errors!
 
     p "Upload a rockspec to create a new module. If the module already exists,

diff --git a/widgets/stats_header.moon b/widgets/stats_header.moon
@@ -1,8 +1,8 @@
-class ManifestHeader extends require "widgets.base"
+class ManifestHeader extends require "widgets.page_header"
   page_name: "global"
 
   inner_content: =>
-    h2 "LuaRocks.org stats"
+    h1 "LuaRocks.org stats"
 
     div class: "page_tabs", ->
       @render_tab "global", "Global stats", @url_for "stats"

diff --git a/widgets/user_settings_page.moon b/widgets/user_settings_page.moon
@@ -1,15 +1,21 @@
+PageHeader = require "widgets.page_header"
 
 class UserSettings extends require "widgets.page"
-  inner_content: =>
-    h2 "Account settings"
-
-    div class: "page_tabs", ->
-      @render_nav_tab "user_settings.profile", "Profile"
-      @render_nav_tab "user_settings.reset_password", "Reset password"
-      @render_nav_tab "user_settings.api_keys", "API keys"
-      @render_nav_tab "user_settings.link_github", "GitHub link"
-      @render_nav_tab "user_settings.import_toolbox", "Lua Toolbox"
+  header_content: =>
+    widget PageHeader {
+      inner_content: ->
+        div class: "page_header_inner" , ->
+          h1 "Account settings"
+
+        div class: "page_tabs", ->
+          @render_nav_tab "user_settings.profile", "Profile"
+          @render_nav_tab "user_settings.reset_password", "Reset password"
+          @render_nav_tab "user_settings.api_keys", "API keys"
+          @render_nav_tab "user_settings.link_github", "GitHub link"
+          @render_nav_tab "user_settings.import_toolbox", "Lua Toolbox"
+    }
 
+  inner_content: =>
     @render_errors!
     @settings_content!