From 0905bc2c1a025b38cf0035f36c57346a563dd506 Mon Sep 17 00:00:00 2001 From: Vit Brunner Date: Tue, 6 Jan 2015 10:24:47 +0100 Subject: [PATCH] Show help/about pages in popup --- Gruntfile.coffee | 3 +++ bower.json | 1 + source/index.html.jade | 6 ++---- source/partials/about.html.jade | 1 + source/partials/help.html.jade | 1 + source/scripts/app.js.coffee | 2 +- source/scripts/controllers.js.coffee | 9 +++++++-- 7 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 source/partials/about.html.jade create mode 100644 source/partials/help.html.jade diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 07dd9e8..0a5a9e1 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -39,6 +39,7 @@ module.exports = (grunt) -> 'bower_components/angular/angular.js' 'bower_components/angular-sanitize/angular-sanitize.js' 'bower_components/angular-scroll/angular-scroll.js' + 'bower_components/ngDialog/js/ngDialog.js' 'bower_components/marked/lib/marked.js' 'scripts/app.js' 'scripts/controllers.js' @@ -54,6 +55,8 @@ module.exports = (grunt) -> ] styles: [ 'bower_components/fontawesome/css/font-awesome.min.css' + 'bower_components/ngDialog/css/ngDialog.css' + 'bower_components/ngDialog/css/ngDialog-theme-default.css' 'bower_components/pure/pure-min.css' 'styles/style.css' ] diff --git a/bower.json b/bower.json index 98679c3..fc7b624 100644 --- a/bower.json +++ b/bower.json @@ -8,6 +8,7 @@ "fontawesome": "4.2.0", "lodash": "2.4.1", "marked": "0.3.2", + "ngDialog": "0.3.8", "pure": "0.2.0", "qunit": "1.13.x" }, diff --git a/source/index.html.jade b/source/index.html.jade index 4480f62..5028275 100644 --- a/source/index.html.jade +++ b/source/index.html.jade @@ -22,11 +22,9 @@ html(ng-app="sideBySide" ng-controller="AppController") .pure-menu.pure-menu-open.pure-menu-horizontal.menu-main ul li - a(href="") Home + a(href="" ng-click="showPage('help')") Help li - a(href="help") Help - li - a(href="about") About + a(href="" ng-click="showPage('about')") About div(ng-controller="ComparisonController" class="cols-{{columns}}") include includes/comparison.html.jade diff --git a/source/partials/about.html.jade b/source/partials/about.html.jade new file mode 100644 index 0000000..3becc1e --- /dev/null +++ b/source/partials/about.html.jade @@ -0,0 +1 @@ +p about page. diff --git a/source/partials/help.html.jade b/source/partials/help.html.jade new file mode 100644 index 0000000..70bbe74 --- /dev/null +++ b/source/partials/help.html.jade @@ -0,0 +1 @@ +p help stuff... diff --git a/source/scripts/app.js.coffee b/source/scripts/app.js.coffee index c9a2511..c3ca98a 100644 --- a/source/scripts/app.js.coffee +++ b/source/scripts/app.js.coffee @@ -1,4 +1,4 @@ -angular.module('sideBySide', ['sideBySide.controllers', 'ngSanitize', 'duScroll']) +angular.module('sideBySide', ['sideBySide.controllers', 'ngDialog', 'ngSanitize', 'duScroll']) .config [ '$locationProvider', ($locationProvider) -> $locationProvider.html5Mode true ] diff --git a/source/scripts/controllers.js.coffee b/source/scripts/controllers.js.coffee index 06344e0..30e7ba4 100644 --- a/source/scripts/controllers.js.coffee +++ b/source/scripts/controllers.js.coffee @@ -1,13 +1,18 @@ angular.module("sideBySide.controllers", []) .controller "AppController", -['$scope', 'poems' -($scope, poems) -> +['$scope', 'ngDialog', 'poems' +($scope, ngDialog, poems) -> $scope.title = => sbs = 'Side By Side viewer' if poems.config.title poems.config.title + ' – ' + sbs else sbs + + $scope.showPage = (page) -> + ngDialog.open { + template: 'partials/' + page + '.html' + } ] .controller "ComparisonController", ['$document', '$rootScope', '$scope', 'filter', 'load', 'poems', 'route', 'transformer'