Merge branch 'release/v0.7.0'

lib/fontawesome-4.2.0/css/font-awesome.css → lib/font-awesome-4.3.0/css/font-awesome.css

@@ -1,13 +1,13 @@
 /*!
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.2.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.3.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.3.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.3.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.3.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -18,6 +18,7 @@
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  transform: translate(0, 0);
 }
 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
@@ -80,6 +81,10 @@
   -webkit-animation: fa-spin 2s infinite linear;
   animation: fa-spin 2s infinite linear;
 }
+.fa-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+  animation: fa-spin 1s infinite steps(8);
+}
 @-webkit-keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -610,6 +615,7 @@
 .fa-twitter:before {
   content: "\f099";
 }
+.fa-facebook-f:before,
 .fa-facebook:before {
   content: "\f09a";
 }
@@ -1259,7 +1265,8 @@
 .fa-male:before {
   content: "\f183";
 }
-.fa-gittip:before {
+.fa-gittip:before,
+.fa-gratipay:before {
   content: "\f184";
 }
 .fa-sun-o:before {
@@ -1526,6 +1533,7 @@
 .fa-history:before {
   content: "\f1da";
 }
+.fa-genderless:before,
 .fa-circle-thin:before {
   content: "\f1db";
 }
@@ -1670,3 +1678,124 @@
 .fa-meanpath:before {
   content: "\f20c";
 }
+.fa-buysellads:before {
+  content: "\f20d";
+}
+.fa-connectdevelop:before {
+  content: "\f20e";
+}
+.fa-dashcube:before {
+  content: "\f210";
+}
+.fa-forumbee:before {
+  content: "\f211";
+}
+.fa-leanpub:before {
+  content: "\f212";
+}
+.fa-sellsy:before {
+  content: "\f213";
+}
+.fa-shirtsinbulk:before {
+  content: "\f214";
+}
+.fa-simplybuilt:before {
+  content: "\f215";
+}
+.fa-skyatlas:before {
+  content: "\f216";
+}
+.fa-cart-plus:before {
+  content: "\f217";
+}
+.fa-cart-arrow-down:before {
+  content: "\f218";
+}
+.fa-diamond:before {
+  content: "\f219";
+}
+.fa-ship:before {
+  content: "\f21a";
+}
+.fa-user-secret:before {
+  content: "\f21b";
+}
+.fa-motorcycle:before {
+  content: "\f21c";
+}
+.fa-street-view:before {
+  content: "\f21d";
+}
+.fa-heartbeat:before {
+  content: "\f21e";
+}
+.fa-venus:before {
+  content: "\f221";
+}
+.fa-mars:before {
+  content: "\f222";
+}
+.fa-mercury:before {
+  content: "\f223";
+}
+.fa-transgender:before {
+  content: "\f224";
+}
+.fa-transgender-alt:before {
+  content: "\f225";
+}
+.fa-venus-double:before {
+  content: "\f226";
+}
+.fa-mars-double:before {
+  content: "\f227";
+}
+.fa-venus-mars:before {
+  content: "\f228";
+}
+.fa-mars-stroke:before {
+  content: "\f229";
+}
+.fa-mars-stroke-v:before {
+  content: "\f22a";
+}
+.fa-mars-stroke-h:before {
+  content: "\f22b";
+}
+.fa-neuter:before {
+  content: "\f22c";
+}
+.fa-facebook-official:before {
+  content: "\f230";
+}
+.fa-pinterest-p:before {
+  content: "\f231";
+}
+.fa-whatsapp:before {
+  content: "\f232";
+}
+.fa-server:before {
+  content: "\f233";
+}
+.fa-user-plus:before {
+  content: "\f234";
+}
+.fa-user-times:before {
+  content: "\f235";
+}
+.fa-hotel:before,
+.fa-bed:before {
+  content: "\f236";
+}
+.fa-viacoin:before {
+  content: "\f237";
+}
+.fa-train:before {
+  content: "\f238";
+}
+.fa-subway:before {
+  content: "\f239";
+}
+.fa-medium:before {
+  content: "\f23a";
+}

src/main/app/coffee/modules/common/CommonViews.coffee

@@ -0,0 +1,46 @@
+SkeletonApp.module 'Common', (Common, SkeletonApp, Backbone, Marionette, $, _) ->
+
+  # Define the View for a Modal Dialog
+  class Common.DialogView extends Backbone.Marionette.ItemView
+
+    defaultOptions =
+      title: 'Confirm'
+      body: 'Click OK to confirm.'
+      buttons: [
+        title: 'Cancel'
+        triggerName: 'cancel'
+        dismiss: true
+      ,
+        title: 'OK'
+        triggerName: 'ok'
+        class: 'btn-primary'
+      ]
+
+    template: 'dialog'
+
+    className: 'modal fade'
+
+    ui:
+      dialogButton: '.js-dialog-button'
+
+    events:
+      'click @ui.dialogButton': 'onButtonClicked'
+
+    initialize: (opts) ->
+      logger.debug "DialogView.initialize"
+      @options = _.defaults {}, opts, defaultOptions
+
+    serializeData: ->
+      @options
+
+    onShow: ->
+      @$el.modal 'show'
+
+    onHide: ->
+      @$el.modal 'hide'
+
+    onButtonClicked: (e) ->
+      logger.debug "DialogView.onButtonClicked"
+      e.preventDefault()
+      triggerName = $(e.target).attr 'data-trigger'
+      @triggerMethod triggerName

src/main/app/coffee/modules/features/FeatureController.coffee

@@ -0,0 +1,32 @@
+SkeletonApp.module 'Feature', (Feature, SkeletonApp, Backbone, Marionette, $, _) ->
+
+  # Define the Router for the Feature module
+  class FeatureRouter extends Marionette.AppRouter
+
+    appRoutes:
+      'features/dialog': 'showDialogFeature'
+
+  # Define the Controller for the Feature module
+  class FeatureController extends Marionette.Controller
+
+    showDialogFeature: ->
+      logger.debug "FeatureController.showDialogFeature"
+      controller = new Feature.Dialog.Controller
+      controller.show()
+
+
+  # Create an instance
+  controller = new FeatureController
+
+
+  # When the module is initialized...
+  Feature.addInitializer ->
+    logger.debug "Content initializer"
+    router = new FeatureRouter
+      controller: controller
+
+
+  # Handle Application Messaging
+  SkeletonApp.commands.setHandler 'feature:dialog:show', ->
+    SkeletonApp.navigate 'features/dialog'
+    controller.showDialogFeature()

src/main/app/coffee/modules/features/dialog/DialogFeatureController.coffee

@@ -0,0 +1,51 @@
+SkeletonApp.module 'Feature.Dialog', (Dialog, SkeletonApp, Backbone, Marionette, $, _) ->
+
+  # Define the Controller for the Content module
+  class Dialog.Controller extends Marionette.Controller
+
+    show: ->
+      logger.debug "Dialog.Controller.show"
+      view = new Dialog.FeatureView
+
+      view.on 'dialog:show', ->
+        dialogView = new SkeletonApp.Common.DialogView
+
+        dialogView.on 'ok', ->
+          logger.debug "Handling 'ok' dialog event"
+          dialogView.triggerMethod 'hide'
+          # Execute 'OK' logic
+
+        dialogView.on 'cancel', ->
+          logger.debug "Handling 'cancel' dialog event"
+          dialogView.triggerMethod 'hide'
+          # Execute 'Cancel' logic, if any
+
+        SkeletonApp.dialogRegion.show dialogView
+
+      view.on 'dialog:custom:show', ->
+        dialogView = new SkeletonApp.Common.DialogView
+          title: 'Terms and Conditions'
+          body: 'Click ACCEPT to accept the terms and conditions.'
+          buttons: [
+            title: 'Cancel'
+            triggerName: 'cancel'
+            dismiss: true
+          ,
+            title: 'Accept'
+            triggerName: 'accept'
+            class: 'btn-success'
+          ]
+
+        dialogView.on 'accept', ->
+          logger.debug "Handling 'accept' dialog event"
+          dialogView.triggerMethod 'hide'
+          # Execute 'Accept' logic
+
+        dialogView.on 'cancel', ->
+          logger.debug "Handling 'cancel' dialog event"
+          dialogView.triggerMethod 'hide'
+          # Execute 'Cancel' logic, if any
+
+        SkeletonApp.dialogRegion.show dialogView
+
+      SkeletonApp.contentRegion.show view

src/main/app/coffee/modules/features/dialog/DialogFeatureViews.coffee

@@ -0,0 +1,15 @@
+SkeletonApp.module 'Feature.Dialog', (Dialog, SkeletonApp, Backbone, Marionette, $, _) ->
+
+  class Dialog.FeatureView extends Backbone.Marionette.ItemView
+
+    template: 'featuredialog'
+
+    className: 'container'
+
+    ui:
+      dialogButton: '.js-dialog'
+      customDialogButton: '.js-dialog-alt'
+
+    triggers:
+      'click @ui.dialogButton': 'dialog:show'
+      'click @ui.customDialogButton': 'dialog:custom:show'

src/main/app/css/app.css

@@ -10,3 +10,22 @@ footer div.row:first-child {
   padding-top: 20px;
   border-top: 1px solid #bbbbbb;
 }
+
+.link-danger:link,.link-danger:visited {
+  color: #bbbbbb;
+}
+.link-danger:hover {
+  color: #e52c23;
+}
+.link-danger:active {
+  color: #e52c23;
+}
+.link-black:link,.link-black:visited {
+  color: #bbbbbb;
+}
+.link-black:hover {
+  color: #000000;
+}
+.link-danger:active {
+  color: #000000;
+}

src/main/app/index.html

@@ -8,7 +8,7 @@
     <title>LeanStacks | Marionette SPA Project Skeleton</title>
 
     <link href="assets/lib/bootstrap-3.3.1/css/bootstrap-paper.min.css" rel="stylesheet">
-    <link href="assets/lib/fontawesome-4.2.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href="assets/lib/font-awesome-4.3.0/css/font-awesome.min.css" rel="stylesheet">
     <link href="assets/app/css/app.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -36,6 +36,9 @@
     <script src="assets/lib/bootstrap-3.3.1/js/bootstrap.min.js"></script>
     <script src="assets/app/js/app-templates-1.0.0.js"></script>
     <script src="assets/app/js/app-1.0.0.min.js"></script>
+    <!-- Uncomment the Google Analytics Script to Use -->
+    <!-- Replace the Tracking ID with your Tracking ID -->
+    <!--
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -44,5 +47,6 @@
 
       ga('create', 'UA-12345678-1', 'auto');
     </script>
+    -->
   </body>
 </html>