diff --git a/app/app.js b/app/app.js index 106e36d8..c77247a6 100755 --- a/app/app.js +++ b/app/app.js @@ -23,7 +23,8 @@ angular.module('ModelSEED', 'Biochem', 'Browser', 'Regulons', - 'Dialogs' + 'Dialogs', + 'docs-directives' ]) .config(['$locationProvider', '$stateProvider', '$httpProvider', '$urlRouterProvider', '$urlMatcherFactoryProvider', '$sceProvider', @@ -165,6 +166,12 @@ function($locationProvider, $stateProvider, $httpProvider, controller: 'Proto', }) + .state('app.faq', { + url: "/faq", + templateUrl: 'app/views/docs/faq.html', + }) + + /* only used for testing analysis forms */ .state('app.run', { url: "/run", diff --git a/app/ctrls/ctrls.js b/app/ctrls/ctrls.js index 28f4c59e..eab5cc75 100755 --- a/app/ctrls/ctrls.js +++ b/app/ctrls/ctrls.js @@ -4,6 +4,13 @@ angular.module('ctrls', []) $scope.MV = MV; }]) +.controller('Documentation', +['$scope', '$state', +function($scope, $state) { + + console.log('state', $state) + +}]) .controller('MyModels', ['$scope', 'WS', 'MS', '$compile', 'uiTools', '$mdDialog', 'Dialogs', diff --git a/app/directives/docs.js b/app/directives/docs.js new file mode 100644 index 00000000..fd6cff00 --- /dev/null +++ b/app/directives/docs.js @@ -0,0 +1,25 @@ + +angular.module('docs-directives', []); +angular.module('docs-directives') + +.directive('msFaq', ['$http', function($http) { + return { + template: '
'+ + ''+ + ' Edit on Github'+ + '', + link: function(scope, elem, attr) { + var url = attr.msFaq; + $http.get(url) + .then(function(res) { + var text = window.atob(res.data.content); + scope.githubURL = res.data.html_url; + + var converter = new showdown.Converter(), + html = converter.makeHtml(text); + + scope.data = html; + }) + } + }; +}]) diff --git a/app/views/app.html b/app/views/app.html index ed8e183f..b3e031dc 100755 --- a/app/views/app.html +++ b/app/views/app.html @@ -1,158 +1,12 @@
- - -
- - menu - - -
- - - - -
-
- - Model Analysis - ({{MV.models.length}}) - -
- -
- - -
- ( - Clear All - ) -
- -
- -
-
- - - - -
- - - - + +
- + diff --git a/app/views/docs/faq.html b/app/views/docs/faq.html new file mode 100644 index 00000000..37180a8a --- /dev/null +++ b/app/views/docs/faq.html @@ -0,0 +1,2 @@ + +
diff --git a/app/views/sidebar.html b/app/views/sidebar.html new file mode 100644 index 00000000..294fef03 --- /dev/null +++ b/app/views/sidebar.html @@ -0,0 +1,65 @@ + + + +
+ + menu + + +
+ + + + +
+
+ + Model Analysis + ({{MV.models.length}}) + +
+ +
+ + +
+ ( + Clear All + ) +
+ +
+ +
+
+ + diff --git a/app/views/toolbar.html b/app/views/toolbar.html new file mode 100644 index 00000000..26beb54d --- /dev/null +++ b/app/views/toolbar.html @@ -0,0 +1,87 @@ + + + + + + diff --git a/bower.json b/bower.json index 0b3ebc76..198bc13f 100644 --- a/bower.json +++ b/bower.json @@ -22,7 +22,8 @@ "angular-material": "0.10.0", "angular-scroll": "0.6.5", "angular": "1.4.0", - "angular-animate": "1.3.15" + "angular-animate": "1.3.15", + "showdown": "1.2.1" }, "resolutions": { "angular": "1.4.0" diff --git a/css/core.css b/css/core.css index 00d73f8f..fafa7ef1 100644 --- a/css/core.css +++ b/css/core.css @@ -1,3 +1,6 @@ + +@import url("docs.css"); + body { font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; -webkit-font-smoothing: subpixel-antialiased; diff --git a/css/docs.css b/css/docs.css new file mode 100644 index 00000000..c3b1690f --- /dev/null +++ b/css/docs.css @@ -0,0 +1,18 @@ + + +#docs h5 { + font-size: 1.4em; +} + +#docs h1 { + padding-bottom: 10px; + margin-bottom: 20px; + border-bottom: 1px solid #eee; +} + +.edit-docs-btn { + position: absolute; + top: 30px; + right: 30px; + font-size: .9em; +} diff --git a/icomoon/demo.html b/icomoon/demo.html index fe4a4237..fd25ee69 100755 --- a/icomoon/demo.html +++ b/icomoon/demo.html @@ -9,7 +9,7 @@
-

Font Name: icomoon (Glyphs: 23)

+

Font Name: icomoon (Glyphs: 24)

Grid Size: Unknown

@@ -342,6 +342,22 @@

Grid Size: 16

+
+
+ + + + icon-pencil2 +
+
+ + +
+
+ liga: + +
+
diff --git a/icomoon/fonts/icomoon.eot b/icomoon/fonts/icomoon.eot index 1e5ab3c8..6c6a05c7 100755 Binary files a/icomoon/fonts/icomoon.eot and b/icomoon/fonts/icomoon.eot differ diff --git a/icomoon/fonts/icomoon.svg b/icomoon/fonts/icomoon.svg index 5ec6b069..20766529 100755 --- a/icomoon/fonts/icomoon.svg +++ b/icomoon/fonts/icomoon.svg @@ -28,6 +28,7 @@ + \ No newline at end of file diff --git a/icomoon/fonts/icomoon.ttf b/icomoon/fonts/icomoon.ttf index c4c11943..15273ed4 100755 Binary files a/icomoon/fonts/icomoon.ttf and b/icomoon/fonts/icomoon.ttf differ diff --git a/icomoon/fonts/icomoon.woff b/icomoon/fonts/icomoon.woff index d4531fb1..cf282cc6 100755 Binary files a/icomoon/fonts/icomoon.woff and b/icomoon/fonts/icomoon.woff differ diff --git a/icomoon/selection.json b/icomoon/selection.json index dcd375c4..01d84342 100755 --- a/icomoon/selection.json +++ b/icomoon/selection.json @@ -571,6 +571,32 @@ "setId": 3, "iconIdx": 4 }, + { + "icon": { + "paths": [ + "M384 640l128-64 448-448-64-64-448 448-64 128zM289.3 867.098c-31.632-66.728-65.666-100.762-132.396-132.394l99.096-272.792 128-77.912 384-384h-192l-384 384-192 640 640-192 384-384v-192l-384 384-77.912 128z" + ], + "attrs": [], + "tags": [ + "pencil", + "write", + "edit" + ], + "grid": 16 + }, + "attrs": [], + "properties": { + "id": 67, + "order": 17, + "prevSize": 32, + "ligatures": "pencil2, write2", + "name": "pencil2", + "code": 58901 + }, + "setIdx": 5, + "setId": 0, + "iconIdx": 6 + }, { "icon": { "paths": [ diff --git a/icomoon/style.css b/icomoon/style.css index 58e1820f..7e663f57 100755 --- a/icomoon/style.css +++ b/icomoon/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src:url('fonts/icomoon.eot?94kwi0'); - src:url('fonts/icomoon.eot?#iefix94kwi0') format('embedded-opentype'), - url('fonts/icomoon.ttf?94kwi0') format('truetype'), - url('fonts/icomoon.woff?94kwi0') format('woff'), - url('fonts/icomoon.svg?94kwi0#icomoon') format('svg'); + src:url('fonts/icomoon.eot?-ov0i0'); + src:url('fonts/icomoon.eot?#iefix-ov0i0') format('embedded-opentype'), + url('fonts/icomoon.ttf?-ov0i0') format('truetype'), + url('fonts/icomoon.woff?-ov0i0') format('woff'), + url('fonts/icomoon.svg?-ov0i0#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -83,6 +83,9 @@ .icon-leaf:before { content: "\e9a4"; } +.icon-pencil2:before { + content: "\e615"; +} .icon-quill:before { content: "\e614"; } diff --git a/index.html b/index.html index 1d8abded..e6765a9d 100644 --- a/index.html +++ b/index.html @@ -36,19 +36,22 @@ - + + + + + - + --> @@ -84,6 +87,7 @@ +