Squashed commit of the following:

commit 4cdee1a Author: Gregory Brown <gregory.t.brown@gmail.com> Date: Sat Feb 1 09:42:27 2014 -0500 Remove redundant sign in commit 85d0ab7 Author: Jordan Byron <jordan.byron@gmail.com> Date: Thu Jan 30 17:01:42 2014 -0500 Fix specs and ensure confirmation emails are being sent commit a4e0f80 Merge: 7b71253 1eb52f7 Author: Jordan Byron <jordan.byron@gmail.com> Date: Thu Jan 30 16:33:18 2014 -0500 Merge branch 'seekrit' of github.com:elm-city-craftworks/practicing-ruby-web into seekrit commit 7b71253 Author: Jordan Byron <jordan.byron@gmail.com> Date: Thu Jan 30 16:32:56 2014 -0500 Only send confirmation email to active users commit 1eb52f7 Author: Gregory Brown <gregory.t.brown@gmail.com> Date: Thu Jan 30 09:52:08 2014 -0500 We'll do it live! commit e49c669 Author: Gregory Brown <gregory.t.brown@gmail.com> Date: Thu Jan 30 09:50:34 2014 -0500 Now put better words on it. commit a021103 Author: Gregory Brown <gregory.t.brown@gmail.com> Date: Thu Jan 30 09:47:30 2014 -0500 Update the real share box commit a319e64 Author: Gregory Brown <gregory.t.brown@gmail.com> Date: Thu Jan 30 09:42:57 2014 -0500 Reword share box commit 097acfa Author: Jordan Byron <jordan.byron@gmail.com> Date: Thu Jan 30 08:11:50 2014 -0500 Static page styling for consistency with new design commit cfdfb1e Author: Jordan Byron <jordan.byron@gmail.com> Date: Thu Jan 30 08:06:29 2014 -0500 Last round of style fixes - Broadcasts, share-alert width commit 373ea1e Merge: df2d3b9 4372365 Author: Jordan Byron <jordan.byron@gmail.com> Date: Wed Jan 29 20:52:24 2014 -0500 Merge branch 'master' into seekrit [skip ci] commit df2d3b9 Author: Jordan Byron <jordan.byron@gmail.com> Date: Wed Jan 29 19:24:50 2014 -0500 Restore tests and fix leaky draft articles commit 2cdc06f Author: Jordan Byron <jordan.byron@gmail.com> Date: Wed Jan 29 17:16:38 2014 -0500 Another MMMMega commit :godmode: w/ @seacreature commit 23b66b8 Author: Jordan Byron <jordan.byron@gmail.com> Date: Wed Jan 29 12:02:02 2014 -0500 Restore Cache Cooker commit 3716cf6 Author: Mathias Lafeldt <mathias.lafeldt@gmail.com> Date: Sun Nov 10 12:55:47 2013 +0100 Add Chef cookbook to README commit 12ffd82 Author: Mathias Lafeldt <mathias.lafeldt@gmail.com> Date: Sun Nov 10 11:43:57 2013 +0100 Fix link to deployment documentation commit a03e17c Author: Jordan Byron <jordan.byron@gmail.com> Date: Tue Jan 28 16:17:44 2014 -0500 Archives styling commit 3c03a9c Author: Jordan Byron <jordan.byron@gmail.com> Date: Tue Jan 28 15:30:50 2014 -0500 Fix tests after admin-bar rename commit 7e0f85e Author: Jordan Byron <jordan.byron@gmail.com> Date: Tue Jan 28 15:28:30 2014 -0500 Restore share-alert on articles and fix branded header commit 174eb97 Author: Jordan Byron <jordan.byron@gmail.com> Date: Tue Jan 28 15:12:16 2014 -0500 Navbar styling overhaul Adios "admin-bar" commit b4ae5a3 Author: Jordan Byron <jordan.byron@gmail.com> Date: Tue Jan 28 14:47:04 2014 -0500 Style improvements commit b309076 Author: Jordan Byron <jordan.byron@gmail.com> Date: Tue Jan 28 10:30:40 2014 -0500 MMMMonster commit!!! :godmode: - Update draper gem - Combine archives and library page => articles/index - Update tests commit bceaf78 Author: Gregory Brown <gregory.t.brown@gmail.com> Date: Sun Jan 26 09:32:31 2014 -0500 Spike to create a public archives page commit 3e2fe18 Author: Jordan Byron <jordan.byron@gmail.com> Date: Sat Jan 25 17:02:03 2014 -0500 Add [Subscriber Only] tag to article titles commit f9add76 Author: Jordan Byron <jordan.byron@gmail.com> Date: Sat Jan 25 16:56:42 2014 -0500 Allow Articles with the status of public to be viewed publicly commit 758d188 Author: Jordan Byron <jordan.byron@gmail.com> Date: Sat Jan 25 16:12:30 2014 -0500 Open up the doors
elm-city-craftworks · Feb 2, 2014 · fdf1f00 · fdf1f00
1 parent 4372365
commit fdf1f00
Show file tree

Hide file tree

Showing 87 changed files with 658 additions and 1,014 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -88,9 +88,11 @@ GEM
     dotenv (0.9.0)
     dotenv-rails (0.9.0)
       dotenv (= 0.9.0)
-    draper (0.14.0)
-      actionpack (~> 3.2)
-      activesupport (~> 3.2)
+    draper (1.3.0)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      request_store (~> 1.0.3)
     erubis (2.7.0)
     eventmachine (1.0.3)
     exception_notification (2.5.2)
@@ -159,7 +161,7 @@ GEM
     minitest (4.7.0)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     multi_xml (0.5.3)
     multipart-post (1.2.0)
     mustache (0.99.4)
@@ -233,6 +235,7 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.1.1)
+    request_store (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rubyzip (0.9.9)

diff --git a/app/assets/javascripts/github_redirect_warning.js.coffee b/app/assets/javascripts/github_redirect_warning.js.coffee
@@ -1,6 +1,8 @@
-$(document).on 'click', "a[href='/subscribe']", (e) ->
-  e.preventDefault()
-  $.facebox {ajax: '/subscribe'}, 'redirect-warning'
-  setTimeout ->
-    window.location.href = '/login'
-  , 5000
+$(document).on 'click',
+  "a[href='/subscriptions/new'][data-redirect-warning='true']",
+  (e) ->
+    e.preventDefault()
+    $.facebox {ajax: '/subscriptions/redirect'}, 'redirect-warning'
+    setTimeout ->
+      window.location.href = '/login'
+    , 5000
diff --git a/app/assets/javascripts/pr.payment_processor.coffee b/app/assets/javascripts/pr.payment_processor.coffee
@@ -53,7 +53,7 @@ class PR.PaymentProcessor
     else
       return false
   checkCoupon: =>
-    $.getJSON '/registration/coupon_valid', { coupon: @couponCode }, (data) =>
+    $.getJSON '/subscriptions/coupon_valid', { coupon: @couponCode }, (data) =>
       if data.coupon_valid
         this.submitPayment()
       else

diff --git a/app/assets/javascripts/pr.toggle.js.coffee b/app/assets/javascripts/pr.toggle.js.coffee
@@ -1,4 +1,5 @@
 $(document).on 'click', 'a[data-toggle]', (e) ->
   target = $(this).data('toggle')
   $(target).toggleClass('visible')
+  $.post '/toggle_nav'
   e.preventDefault()
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
@@ -27,5 +27,4 @@
 @import partials/admin
 @import partials/payments
 @import partials/archives
-@import partials/registration
 @import partials/email_confirmation_warning
diff --git a/app/assets/stylesheets/partials/_admin.sass b/app/assets/stylesheets/partials/_admin.sass
@@ -30,55 +30,3 @@ table#reports
     margin: 0 auto
 .control-bar-padding
   height: 50px
-
-#admin-bar-toggle
-  position: fixed
-  top: 0
-  right: 40px
-  background-color: $red
-  padding: 5px 15px
-  +single-box-shadow(#333, 0, 0, 2px)
-  +border-bottom-radius(2px)
-  +single-transition(all, .10s, ease-out, 0)
-  color: #fff
-  font-size: 2em
-  text-decoration: none
-  z-index: 2
-  &:hover
-    padding-top: 15px
-#admin-bar
-  &.visible
-    .placeholder
-      height: 32px
-    .nav
-      top: 0
-  .placeholder
-    +single-transition(height, .40s, ease-in-out, 0)
-    height: 0
-  .nav
-    +single-transition(top, .40s, ease-in-out, 0)
-    z-index: 1
-    font-family: sans-serif
-    letter-spacing: normal
-    position: fixed
-    top: -32px
-    left: 0
-    right: 0
-    width: 100%
-    background-color: #444
-    padding: 5px 0
-    +single-box-shadow(#333, 0, 0, 2px)
-
-    ul
-      width: 750px
-      margin: 0 auto
-      li
-        display: inline
-        margin-right: 1em
-        a
-          color: #fff
-          text-decoration: none
-        &.right
-          float: right
-          margin-right: 0
-          margin-left: 1em
diff --git a/app/assets/stylesheets/partials/_archives.sass b/app/assets/stylesheets/partials/_archives.sass
@@ -1,25 +1,62 @@
-body.home-archives
+body.articles-index #archives, body.home-public_archives #archives
+  margin-top: 20px
+
   p, h2, li
     font-family: sans-serif
     letter-spacing: normal
+  h1
+    font-size: 2.5em
+    margin: 0.5em 0
   h2
-    font-size: 1.1em
-    color: rgb(176, 60, 46)
-    margin: 20px 0
+    //background: #ecf0f1
+    color: #7B7D83
+    padding: 10px 0
+    border-bottom: 1px solid #ddd
   ul.articles
+    padding: 0 20px
+    margin: 10px 0
     li
-      margin-bottom: 5px
+      padding: 20px 0
+      border-bottom: 1px solid #dddddd
       a
         color: #333
+        text-decoration: none
+        &:hover
+          color: $light-blue
       .title
-        font-size: 1.25em
-        color: $red
         display: inline
       .description
-        margin-top: 15px
-        margin-bottom: 25px
-        font-size: 0.9em
+        margin-top: 5px
+        font-size: 0.75em
       .details
-        color: #777
-        font-size: 1.1em
+        color: #aaa
+        font-weight: lighter
         float: right
+      &:last-child
+        border-bottom: none
+  table.archives
+    width: 100%
+    font-family: sans-serif
+    letter-spacing: normal
+    table
+      width: 100%
+      margin-bottom: 20px
+    td
+      &.month, &.article, &.issue-number, &.description
+        padding: 5px 0
+      &.month
+        text-align: right
+      &.issue-number
+        padding: 5px 0
+        color: #aaa
+        width: 100px
+        text-align: right
+      a
+        color: #000
+        text-decoration: none
+        font-weight: normal
+      &.description, &.month
+        padding-top: 0
+        padding-bottom: 20px
+        font-size: 0.75em
+        color: #666666
diff --git a/app/assets/stylesheets/partials/_broadcasts.sass b/app/assets/stylesheets/partials/_broadcasts.sass
@@ -1,19 +1,20 @@
+#top-bar
+  background-color: darken(#f0f1f4, 10%)
+
 #broadcasts
   width: $page-width
   margin: 0 auto
   text-align: center
+  font-family: sans-serif
   a.dismiss
     float: right
-    color: #fff
+    color: #1b1b1b
     font-size: 0.75em
     line-height: 3em
+    text-decoration: none
   .broadcast
     display: block
     text-align: center
     padding: 7px 0
-    padding-left: 60px
-    background-image: asset-url("announcement.png", image)
-    background-repeat: no-repeat
-    background-position: 0px 4px
     a
-      color: #fff
+      color: $red
diff --git a/app/assets/stylesheets/partials/_email_confirmation_warning.sass b/app/assets/stylesheets/partials/_email_confirmation_warning.sass
@@ -1,4 +1,5 @@
 #email-confirmation-warning
+  width: 750px
   font-family: Helvetica, sans-serif
   @extend #share-alert
   box-sizing: border-box

diff --git a/app/assets/stylesheets/partials/_landing.sass b/app/assets/stylesheets/partials/_landing.sass
@@ -1,75 +1,40 @@
-body.landing #top-bar
-  height: 4px
-  background-color: $dark-blue
-  position: relative
-  ul
-    position: absolute
-    bottom: -33px
-    right: 100px
-    height: 36px
-    li
-      display: inline
-      float: left
-      list-style: none
-      margin-left: 10px
-      a
-        +single-transition(all, .10s, ease-out, 0)
-        background-color: $dark-blue
-        padding: 10px
-        +border-bottom-radius(3px)
-        display: block
-        color: #fff
-        text-decoration: none
-        font-family: 'Folks-Light', 'Folks', sans-serif
-        &:hover
-          padding-top: 15px
-#landing
-  width: 750px
-  margin: 50px auto
-  margin-top: 90px
-  #share-alert
-    font-size: 1.5em
-    margin-bottom: 30px
-  #banner
-    img
-      margin: 30px 0
+body.home-public_archives, body.articles-index
+  header
     text-align: center
-    h1, h2, p
+    padding: 20px 0
+    h1, h2
       margin: 30px 0
     h1
+      margin-top: 0
       color: $red
       font-size: 98px
-      margin-top: 0
+      line-height: 98px
     h2
       color: rgba(69, 76, 86, 0.77)
       font-size: 32px
       font-family: 'Folks-Light', 'Folks', sans-serif
     p#description
       color: #888
       font-size: 20px
-  #details
-    color: rgba(69, 76, 86, 0.77)
-    text-align: justify
-    p, h3
-      margin: 30px 0
-    p
-      line-height: 1.4em
-      font-size: 1.1em
-    h3
-      font-size: 24px
-      text-align: center
-      color: #373D46
-  #library
-    text-align: center
-    a
-      +money-button
-      font-size: 1.5em
-      text-decoration: none
+  p, h2, li
+    font-family: sans-serif
+    letter-spacing: normal
 
-#facebox .redirect-warning
-  font-family: sans-serif
-  h1
-    font-weight: bold
-  p
-    font-size: 12px
-    color: #888
+  #landing
+    padding: 0 20px
+    background: #fff
+    border: 2px solid #ddd
+    border-radius: 2px
+
+  h2.archives-header
+    margin: 20px 0
+    padding-top: 10px
+    color: #454c56
+    font-size: 20px
+    border-bottom: 1px solid #ddd
+    padding-bottom: 5px
+    a
+      font-size: 0.6em
+      float: right
+      display: block
+      margin-top: 7px
diff --git a/app/assets/stylesheets/partials/_layout.sass b/app/assets/stylesheets/partials/_layout.sass
@@ -5,6 +5,8 @@ html
   -webkit-text-size-adjust: 100%
   -ms-text-size-adjust: 100%
   overflow-y: scroll
+  margin: 0
+  padding: 0
 
 ::-moz-selection, ::selection
   background: #A0BDC8
@@ -23,10 +25,6 @@ body
   color: $dark-blue
   letter-spacing: 0.04em
 
-  #top-bar
-    min-height: 0px
-    background-color: $dark-blue
-
   header, #content
     width: $page-width
     margin: 0 auto
@@ -70,7 +68,8 @@ body
     margin: 1em 0
     text-align: justify
   a
-    color: $red
+    color: #1b1b1b
+    font-weight: bold
 
   h3
     font-size: 1.5em

diff --git a/app/assets/stylesheets/partials/_library.sass b/app/assets/stylesheets/partials/_library.sass
@@ -1,4 +1,4 @@
-body.home-library
+body.articles-index
   $blueprint-grid-margin:  20px
   $blueprint-grid-width:   18px
   $blueprint-grid-columns: 20