bootstrap3 upgrade (#17), refactoring and house keeping

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 *.min.js
 *.min.js.map
-*.min.css
+*.min.css

.jshintrc-client

@@ -82,4 +82,4 @@
 
   // Custom Globals
   "predef"        : ["$", "_", "Backbone", "moment", "app"]       // additional predefined global variables
-}
+}

.jshintrc-server

@@ -82,4 +82,4 @@
 
   // Custom Globals
   "predef"        : [ ]       // additional predefined global variables
-}
+}

LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -98,4 +98,4 @@ License
 
 MIT
 
-[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/d41f60f22a2148e2e2dc6b705cd01481 "githalytics.com")](http://githalytics.com/jedireza/drywall)
+[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/d41f60f22a2148e2e2dc6b705cd01481 "githalytics.com")](http://githalytics.com/jedireza/drywall)

layouts/account.jade

@@ -7,23 +7,23 @@ html
     link(rel='stylesheet', href='/layouts/core.min.css?#{cacheBreaker}')
     block neck
   body
-    div.navbar.navbar-inverse.navbar-fixed-top
-      div.navbar-inner
-        div.container
-          a.btn.btn-navbar(data-toggle='collapse', data-target='.nav-collapse')
-            span.icon-bar
-            span.icon-bar
-            span.icon-bar
-          a.brand(href='/account/')
-            img(src='/media/logo-white.png', width='150')
-          div.nav-collapse
-            ul.nav
-              li: a(href='/account/') My Account
-              li: a(href='/account/settings/') Settings
-            ul.nav.pull-right
-              li: a(href='/logout/')
-                i.icon-user.icon-white
-                |  Logout
+    div.navbar.navbar-fixed-top
+      div.container
+        a.navbar-brand(href='/account/')
+          img.navbar-logo(src='/media/logo-symbol-64x64.png')
+          span.navbar-brand-label #{projectName}
+        button.navbar-toggle.collapsed(data-toggle='collapse', data-target='.my-navbar-collapse')
+          span.icon-bar
+          span.icon-bar
+          span.icon-bar
+        div.nav-collapse.my-navbar-collapse.collapse
+          ul.nav.navbar-nav
+            li: a(href='/account/') My Account
+            li: a(href='/account/settings/') Settings
+          ul.nav.navbar-nav.pull-right
+            li: a(href='/logout/')
+              i.icon-user.icon-white
+              |  Sign Out
 
     div.page
       div.container
@@ -36,13 +36,12 @@ html
             © #{copyrightYear} #{copyrightName}
           ul.links
             li: a(href='/') Home
-            li: a(href='/about/') About
-            li: a(href='/contact/') Contact
+            li: a(href='/logout/') Sign Out
           div.clearfix
 
     div.ajax-spinner
       img(src='/media/ajax-pulse.gif')
 
     script(src='/layouts/core.min.js?#{cacheBreaker}')
 
-    block feet
+    block feet

layouts/admin.jade

@@ -5,35 +5,35 @@ html
       title #{title}
     meta(name='viewport', content='width=device-width, initial-scale=1.0')
     link(rel='stylesheet', href='/layouts/core.min.css?#{cacheBreaker}')
+    link(rel='stylesheet', href='/layouts/admin.min.css?#{cacheBreaker}')
     block neck
   body
     div.navbar.navbar-inverse.navbar-fixed-top
-      div.navbar-inner
-        div.container
-          a.btn.btn-navbar(data-toggle='collapse', data-target='.nav-collapse')
-            span.icon-bar
-            span.icon-bar
-            span.icon-bar
-          a.brand(href='/admin/')
-            img(src='/media/logo-white.png', width='150')
-          div.nav-collapse
-            ul.nav
-              li.dropdown
-                a.dropdown-toggle(href='#', data-toggle='dropdown')
-                  | System 
-                  span.caret
-                ul.dropdown-menu
-                  li.nav-header Pivoted Settings
-                  li: a(href='/admin/statuses/') Statuses
-                  li: a(href='/admin/categories/') Categories
-                  li.divider
-                  li.nav-header User Admin
-                  li: a(href='/admin/users/') Users
-                  li: a(href='/admin/accounts/') Accounts
-                  li: a(href='/admin/administrators/') Administrators
-                  li: a(href='/admin/admin-groups/') Admin Groups
-            form.navbar-search.pull-right
-              #_search
+      div.container
+        a.navbar-brand(href='/admin/')
+          img.navbar-logo(src='/media/logo-symbol-64x64.png')
+          span.navbar-brand-label #{projectName}
+        button.navbar-toggle.collapsed(data-toggle='collapse', data-target='.my-navbar-collapse')
+          span.icon-bar
+          span.icon-bar
+          span.icon-bar
+        div.nav-collapse.my-navbar-collapse.collapse
+          ul.nav.navbar-nav
+            li.dropdown
+              a.dropdown-toggle(href='#', data-toggle='dropdown')
+                | System 
+                span.caret
+              ul.dropdown-menu
+                li.dropdown-header Pivoted Settings
+                li: a(href='/admin/statuses/') Statuses
+                li: a(href='/admin/categories/') Categories
+                li.divider
+                li.dropdown-header User Admin
+                li: a(href='/admin/users/') Users
+                li: a(href='/admin/accounts/') Accounts
+                li: a(href='/admin/administrators/') Administrators
+                li: a(href='/admin/admin-groups/') Admin Groups
+          form.navbar-form.pull-right#_search
 
     div.page
       div.container
@@ -46,27 +46,26 @@ html
             © #{copyrightYear} #{copyrightName}
           ul.links
             li: a(href='/') Home
-            li: a(href='/logout/') Logout
+            li: a(href='/logout/') Sign Out
           div.clearfix
 
     div.ajax-spinner
       img(src='/media/ajax-pulse.gif')
 
     script(type='text/template', id='tmpl-_search')
-      ul.nav
-        li.dropdown.open
-          input.search-query(name='_search', type='text', placeholder='search', tab-index='1')
-          ul#_search-results-rows.dropdown-menu
+      div.dropdown
+        input.form-control(name='_search', type='text', placeholder='search', tab-index='1')
+        ul#_search-results-rows.dropdown-menu
     script(type='text/template', id='tmpl-_search-results-row')
       |<% if (type && type == 'header') { %>
       |<%= name %>
       |<% } else { %>
       a(href!='<%= url %>') <%= name %>
       |<% } %>
     script(type='text/template', id='tmpl-_search-results-empty-row')
-      li.nav-header no documents matched
+      li.dropdown-header no docs matched
 
     script(src='/layouts/core.min.js?#{cacheBreaker}')
     script(src='/layouts/admin.min.js?#{cacheBreaker}')
 
-    block feet
+    block feet

layouts/default.jade

@@ -8,44 +8,41 @@ html
     block neck
   body
     div.navbar.navbar-fixed-top
-      div.navbar-inner
-        div.container
-          a.btn.btn-navbar(data-toggle='collapse', data-target='.nav-collapse')
-            span.icon-bar
-            span.icon-bar
-            span.icon-bar
-          a.brand(href='/')
-            img(src='/media/logo-black.png', width='150')
-          div.nav-collapse
-            ul.nav
-              li: a(href='/') Home
-              li: a(href='/about/') About
-              li: a(href='/signup/') Sign Up
-              li: a(href='/contact/') Contact
-            ul.nav.pull-right
-              li: a(href='/login/')
-                i.icon-user
-                |  Login
+      div.container
+        a.navbar-brand(href='/')
+          img.navbar-logo(src='/media/logo-symbol-64x64.png')
+          span.navbar-brand-label #{projectName}
+        button.navbar-toggle.collapsed(data-toggle='collapse', data-target='.my-navbar-collapse')
+          span.icon-bar
+          span.icon-bar
+          span.icon-bar
+        div.nav-collapse.my-navbar-collapse.collapse
+          ul.nav.navbar-nav
+            li: a(href='/') Home
+            li: a(href='/about/') About
+            li: a(href='/signup/') Sign Up
+            li: a(href='/contact/') Contact
+          ul.nav.navbar-nav.pull-right
+            li: a(href='/login/')
+              i.icon-user
+              |  Sign In
 
     div.page
       div.container
         block body
 
     div.footer
       div.container
-        div.inner
-          span.copyright.pull-right
-            © #{copyrightYear} #{copyrightName}
-          ul.links
-            li: a(href='/') Home
-            li: a(href='/about/') About
-            li: a(href='/signup/') Sign Up
-            li: a(href='/contact/') Contact
-          div.clearfix
+        span.copyright.pull-right
+          © #{copyrightYear} #{copyrightName}
+        ul.links
+          li: a(href='/') Home
+          li: a(href='/contact/') Contact
+        div.clearfix
 
     div.ajax-spinner
       img(src='/media/ajax-pulse.gif')
 
     script(src='/layouts/core.min.js?#{cacheBreaker}')
 
-    block feet
+    block feet

models.js

@@ -12,4 +12,4 @@ exports = module.exports = function(app, mongoose) {
   require('./schema/Admin')(app, mongoose);
   require('./schema/AdminGroup')(app, mongoose);
   require('./schema/Account')(app, mongoose);
-};
+};

package.json

@@ -15,14 +15,14 @@
     "jade": "~0.27.7",
     "jshint": "~2.1.4",
     "mongoose": "~3.6.7",
-    "passport": "~0.1.16",
+    "passport": "~0.1.17",
     "passport-local": "~0.1.6",
     "passport-oauth": "~0.1.15",
     "passport-facebook": "~0.1.5",
-    "passport-github": "~0.1.4",
+    "passport-github": "~0.1.5",
     "passport-twitter": "~0.1.5",
     "recess": "~1.1.9",
     "uglify-js": "~2.3.6",
     "watchr": "~2.4.3"
   }
-}
+}

passport.js

@@ -97,4 +97,4 @@ exports = module.exports = function(app, passport) {
       }
     });
   });
-};
+};

public/layouts/admin.js

@@ -52,7 +52,7 @@
     el: '#_search',
     template: _.template( $('#tmpl-_search').html() ),
     events: {
-      'keydown .search-query': 'startKeyBuffer'
+      'keydown .form-control': 'startKeyBuffer'
     },
     timeLastKeyPressed: undefined,
     lastTimeoutID: undefined,
@@ -61,13 +61,13 @@
       app._searchView.timeLastKeyPressed = (new Date());
 
       //esc key
-      if (event.keyCode === 27) {
+      if (parseInt(event.keyCode, null) === 27) {
         this.clearResults();
         return;
       }
 
       //enter key
-      if (event.keyCode === 13) {
+      if (parseInt(event.keyCode, null) === 13) {
         if (this.selectedResult !== undefined) {
           var url = this.$el.find('li.active a').attr('href');
           if (url) {
@@ -78,13 +78,13 @@
       }
 
       //up and down keys
-      if (event.keyCode === 38 || event.keyCode === 40) {
+      if (parseInt(event.keyCode, null) === 38 || parseInt(event.keyCode, null) === 40) {
         this.navigateResults(event);
         return false;
       }
 
       //ignore non-alphanumeric, except backspace
-      if (!/[a-zA-Z0-9\-_ ]/.test(String.fromCharCode(event.keyCode)) && event.keyCode !== 8) {
+      if (!/[a-zA-Z0-9\-_ ]/.test(String.fromCharCode(parseInt(event.keyCode, null))) && parseInt(event.keyCode, null) !== 8) {
         return;
       }
 
@@ -104,7 +104,7 @@
       }
     },
     runSearch: function() {
-      var query = this.$el.find('.search-query').val();
+      var query = this.$el.find('.form-control').val();
       if (!query) {
         this.clearResults();
         return;
@@ -115,8 +115,8 @@
     navigateResults: function(event) {
       var arrLinkResults = this.$el.find('li a').get();
 
-      var movingUp = (event.keyCode === 38);
-      var movingDown = (event.keyCode === 40);
+      var movingUp = (parseInt(event.keyCode, null) === 38);
+      var movingDown = (parseInt(event.keyCode, null) === 40);
 
       if (this.selectedResult === undefined && this.$el.find('li a').get(0)) {
         this.selectedResult = -1;
@@ -153,7 +153,7 @@
       }
     },
     clearResults: function() {
-      this.$el.find('.search-query').val('');
+      this.$el.find('.form-control').val('');
       this.$el.find('.dropdown').removeClass('open');
       this.$el.find('#_search-results-rows').html('');
       this.selectedResult = undefined;
@@ -165,7 +165,7 @@
       this.render();
     },
     render: function() {
-      if (this.$el.find('.search-query').val() === '') {
+      if (this.$el.find('.form-control').val() === '') {
         this.$el.find('.dropdown').removeClass('open');
       }
       else {
@@ -197,7 +197,7 @@
     render: function() {
       this.$el.html(this.template( this.model.attributes ));
       if (this.model.get('type') === 'header') {
-        this.$el.addClass('nav-header');
+        this.$el.addClass('dropdown-header');
       }
 
       return this;
@@ -207,4 +207,4 @@
   $(document).ready(function() {
     app._searchView = new app._SearchView();
   });
-}());
+}());