Skip to content
This repository was archived by the owner on Oct 5, 2020. It is now read-only.

Commit 69346fe

Browse files
grtjngrtjn
committed
Merge pull request #354 from grtjn/ui-themes
Minimizing diffs between ui-themes
2 parents 56b614f + 173c654 commit 69346fe

File tree

33 files changed

+763
-539
lines changed

33 files changed

+763
-539
lines changed

‎app/templates/bower.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"angular-mocks": "~1.4.4",
1111
"angular-ui-router": "~0.2.15",
1212
"angular-ui-tinymce": "~0.0.9",
13+
"angular-animate": "~1.4.4",
14+
"ngtoast": "^2.0.0",
1315
"angular-x2js": "https://github.com/janmichaelyu/angular-x2js.git",
1416
"bootstrap": "~3.3.5",
1517
"font-awesome": "~4.6.0",
@@ -20,10 +22,7 @@
2022
"ng-json-explorer": "8c2a0f9104",
2123
"vkbeautify-wrapper": "*",
2224
"highcharts": "^4.2",
23-
"angular-google-maps": "2.3.2",
24-
"angular-component.js": "^0.0.8",
25-
"ngToast": "ngtoast#^2.0.0",
26-
"angular-animate": "^1.5.5"
25+
"angular-google-maps": "2.3.2"
2726
},
2827
"overrides": {
2928
"angular-highlightjs": {

‎app/templates/node-server/proxy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ function getAuth(options, session) {
8181
// Generic proxy function used by multiple HTTP verbs
8282
function proxy(req, res) {
8383
var queryString = req.originalUrl.split('?')[1];
84-
var path = '/v1' + req.path + (queryString ? '?' + queryString : '');
84+
var path = req.baseUrl + req.path + (queryString ? '?' + queryString : '');
8585
console.log(
8686
req.method + ' ' + req.path + ' proxied to ' +
8787
options.mlHost + ':' + options.mlHttpPort + path);

‎app/templates/rest-api/config/options/all.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
<lon ns="" name="longitude"/>
101101
<geo-option>boundaries-included</geo-option>
102102
<geo-option>score-function=reciprocal</geo-option>
103-
<facet-option>empties</facet-option>
104103
<heatmap s="-90" w="-180" n="90" e="180" latdivs="4" londivs="4"/>
105104
</geo-elem-pair>
106105
</constraint>

‎app/templates/ui/app/app.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
'ui.bootstrap',
1818
'ui.router',
1919
'ui.tinymce',
20-
'ngToast',
21-
'ngSanitize'
20+
'ngToast'
2221
]);
2322

2423
}());

‎app/templates/ui/app/create/create.controller.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
address: null,
2525
about: null,
2626
registered: null,
27-
latitude: 0,
28-
longitude: 0,
27+
location: {
28+
latitude: 0,
29+
longitude: 0
30+
},
2931
tags: [],
3032
friends: [],
3133
greeting: null,

‎app/templates/ui/app/create/create.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ <h2 class="col-sm-10">Create a Document</h2>
8282
<div class="form-group">
8383
<label class="col-sm-2 control-label">Location</label>
8484
<div class="col-sm-5">
85-
<input type="text" class="form-control" ng-model="ctrl.person.latitude" placeholder="">
85+
<input type="text" class="form-control" ng-model="ctrl.person.location.latitude" placeholder="">
8686
</div>
8787
<div class="col-sm-5">
88-
<input type="text" class="form-control" ng-model="ctrl.person.longitude" placeholder="">
88+
<input type="text" class="form-control" ng-model="ctrl.person.location.longitude" placeholder="">
8989
</div>
9090
</div>
9191
<div class="form-group">

‎app/templates/ui/app/landing/landing.html‎

Lines changed: 83 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,91 @@
1-
<h1>Successful Deployment!</h1>
2-
<p>
3-
You can go check out the sample application once you've logged in! If you loaded the documents from the <em>data</em> directory via the instructions in the readme, you should also be able to <a href="/search">search</a> over the included dictionary. The application allows you to <a href="/create">create</a> various people that you can then <a href="/search">search</a>. If you fill out all the fields, you'll be able to use the built-in <em>faceting</em> and <em>typeahead</em> features!
4-
</p>
5-
<p>If you need any help making the application your own refer to the links below:</p>
6-
<div class="row">
7-
<div class="col-md-6">
8-
<div class="panel panel-primary">
9-
<div class="panel-heading">
10-
<h3 class="panel-title">Slush Generator</h3>
11-
</div>
12-
<div class="panel-body">
13-
<ul>
14-
<li><a href="https://github.com/marklogic/slush-marklogic-node">MarkLogic Slush Generator Project Home</a></li>
15-
<li><a href="https://github.com/marklogic/slush-marklogic-node/issues">Upcoming Features and Current Issues</a></li>
16-
<li><a href="https://github.com/marklogic/slush-marklogic-node/wiki">Wiki</a>
17-
</ul>
18-
</div>
19-
</div>
20-
</div>
21-
<div class="col-md-6">
22-
<div class="panel panel-primary">
23-
<div class="panel-heading">
24-
<h3 class="panel-title">Recommended Guides and Sites</h3>
25-
</div>
26-
<div class="panel-body">
27-
<ul>
28-
<li><a href="https://docs.marklogic.com/">MarkLogic Documentation</a></li>
29-
<li><a href="https://github.com/marklogic/roxy/wiki">Deploying MarkLogic Using Roxy</a></li>
30-
<li><a href="https://docs.marklogic.com/guide/rest-dev">MarkLogic REST Application Developer's Guide</a></li>
31-
<li><a href="https://github.com/marklogic">MarkLogic Github and Helpful Tools</a></li>
32-
</ul>
1+
<section class="content-header">
2+
<h1>Successful Deployment! <small>Slush Generator</small></h1>
3+
</section>
4+
5+
<section class="content">
6+
<p>You can go check out the sample application once you've logged in! If you loaded the documents from the <em>data</em> directory via the instructions in the readme, you should also be able to <a href="/search">search</a> over the included dictionary. The application allows you to <a href="/create">create</a> various people that you can then <a href="/search">search</a>. If you fill out all the fields, you'll be able to use the built-in <em>faceting</em> and <em>typeahead</em> features!</p>
7+
<p>If you need any help making the application your own refer to the links below:</p>
8+
<div class="row">
9+
<div class="col-md-6">
10+
<div class="panel panel-primary">
11+
<div class="panel-heading">
12+
<h3 class="panel-title">Slush Generator</h3>
13+
</div>
14+
<div class="panel-body">
15+
<ul>
16+
<li><a href="https://github.com/marklogic/slush-marklogic-node">MarkLogic Slush Generator Project Home</a></li>
17+
<li><a href="https://github.com/marklogic/slush-marklogic-node/issues">Upcoming Features and Current Issues</a></li>
18+
<li><a href="https://github.com/marklogic/slush-marklogic-node/wiki">Wiki</a></li>
19+
</ul>
20+
</div>
3321
</div>
3422
</div>
35-
</div>
36-
<div class="col-md-6">
37-
<div class="panel panel-primary">
38-
<div class="panel-heading">
39-
<h3 class="panel-title">Stack Technology</h3>
40-
</div>
41-
<div class="panel-body">
42-
<ul>
43-
<li><a href="http://www.marklogic.com">Database - MarkLogic</strong></a></li>
44-
<li><a href="https://github.com/marklogic/roxy">Build - Roxy</a></li>
45-
<li><a href="http://gulpjs.com/">Build - Gulp</a></li>
46-
<li><a href="http://nodejs.org/">Webserver - NodeJS</a></li>
47-
<li><a href="https://angularjs.org/">Frontend JS - AngularJS</a></li>
48-
<li><a href="https://angular-ui.github.io/bootstrap/">Frontend JS - UIBootstrap</a></li>
49-
<li><a href="http://getbootstrap.com/">Frontend CSS - Bootstrap</a></li>
50-
<li><a href="http://lesscss.org/">Frontend CSS - LESS</a></li>
51-
<li><a href="http://karma-runner.github.io">Testing - Karma</a></li>
52-
</ul>
23+
<div class="col-md-6">
24+
<div class="panel panel-primary">
25+
<div class="panel-heading">
26+
<h3 class="panel-title">Recommended Guides and Sites</h3>
27+
</div>
28+
<div class="panel-body">
29+
<ul>
30+
<li><a href="https://docs.marklogic.com/">MarkLogic Documentation</a></li>
31+
<li><a href="https://github.com/marklogic/roxy/wiki">Deploying MarkLogic Using Roxy</a></li>
32+
<li><a href="https://docs.marklogic.com/guide/rest-dev">MarkLogic REST Application Developer's Guide</a></li>
33+
<li><a href="https://github.com/marklogic">MarkLogic Github and Helpful Tools</a></li>
34+
</ul>
35+
</div>
5336
</div>
5437
</div>
55-
</div>
56-
<div class="col-md-6">
57-
<div class="panel panel-primary">
58-
<div class="panel-heading">
59-
<h3 class="panel-title">IDE Suggestions</h3>
38+
<div class="col-md-6">
39+
<div class="panel panel-primary">
40+
<div class="panel-heading">
41+
<h3 class="panel-title">Stack Technology</h3>
42+
</div>
43+
<div class="panel-body">
44+
<ul>
45+
<li><a href="http://www.marklogic.com">Database - MarkLogic</strong></a></li>
46+
<li><a href="https://github.com/marklogic/roxy">Build - Roxy</a></li>
47+
<li><a href="http://gulpjs.com/">Build - Gulp</a></li>
48+
<li><a href="http://nodejs.org/">Webserver - NodeJS</a></li>
49+
<li><a href="https://angularjs.org/">Frontend JS - AngularJS</a></li>
50+
<li><a href="https://angular-ui.github.io/bootstrap/">Frontend JS - UIBootstrap</a></li>
51+
<li><a href="http://getbootstrap.com/">Frontend CSS - Bootstrap</a></li>
52+
<li><a href="http://lesscss.org/">Frontend CSS - LESS</a></li>
53+
<li><a href="http://karma-runner.github.io">Testing - Karma</a></li>
54+
</ul>
55+
</div>
6056
</div>
61-
<div class="panel-body">
62-
<ul>
63-
<li><a href="http://www.sublimetext.com/3">Sublime Text 3</a>
64-
<ul>
65-
<li><a href="https://sublime.wbond.net/">Package Control</a>:
66-
<ul>
67-
<li><a href="https://github.com/paxtonhare/MarkLogic-Sublime">MarkLogic Plugin</a></li>
68-
<li><a href="https://github.com/uipoet/sublime-jshint">sublime-jshint</a></li>
69-
<li><a href="https://github.com/alexnj/SublimeOnSaveBuild">SublimeOnSaveBuild</a></li>
70-
<li><a href="https://github.com/sindresorhus/editorconfig-sublime">editorconfig-sublime</a></li>
71-
<li><a href="https://github.com/danro/LESS-sublime">LESS (CSS-style highlighting)</a></li>
72-
</ul>
73-
</li>
74-
</ul>
75-
</li>
76-
<li><a href="https://www.jetbrains.com/webstorm/">Webstorm</a></li>
77-
<li>TextMate (2alpha)
78-
<ul>
79-
<li><a href="https://github.com/bodnaristvan/JSHint.tmbundle#readme">jshint</a></li>
80-
<li><a href="https://github.com/Mr0grog/editorconfig-textmate#readme">editorconfig</a></li>
81-
<li><a href="https://github.com/paxtonhare/xquery.tmbundle">MarkLogic auto-completion: XQuery.tmbundle</a></li>
82-
</ul>
83-
</li>
84-
</ul>
57+
</div>
58+
<div class="col-md-6">
59+
<div class="panel panel-primary">
60+
<div class="panel-heading">
61+
<h3 class="panel-title">IDE Suggestions</h3>
62+
</div>
63+
<div class="panel-body">
64+
<ul>
65+
<li><a href="http://www.sublimetext.com/3">Sublime Text 3</a>
66+
<ul>
67+
<li><a href="https://sublime.wbond.net/">Package Control</a>:
68+
<ul>
69+
<li><a href="https://github.com/paxtonhare/MarkLogic-Sublime">MarkLogic Plugin</a></li>
70+
<li><a href="https://github.com/uipoet/sublime-jshint">sublime-jshint</a></li>
71+
<li><a href="https://github.com/alexnj/SublimeOnSaveBuild">SublimeOnSaveBuild</a></li>
72+
<li><a href="https://github.com/sindresorhus/editorconfig-sublime">editorconfig-sublime</a></li>
73+
<li><a href="https://github.com/danro/LESS-sublime">LESS (CSS-style highlighting)</a></li>
74+
</ul>
75+
</li>
76+
</ul>
77+
</li>
78+
<li><a href="https://www.jetbrains.com/webstorm/">Webstorm</a></li>
79+
<li>TextMate (2alpha)
80+
<ul>
81+
<li><a href="https://github.com/bodnaristvan/JSHint.tmbundle#readme">jshint</a></li>
82+
<li><a href="https://github.com/Mr0grog/editorconfig-textmate#readme">editorconfig</a></li>
83+
<li><a href="https://github.com/paxtonhare/xquery.tmbundle">MarkLogic auto-completion: XQuery.tmbundle</a></li>
84+
</ul>
85+
</li>
86+
</ul>
87+
</div>
8588
</div>
8689
</div>
87-
<h3></h3>
88-
<ul>
89-
90-
</ul>
9190
</div>
92-
</div>
91+
</section>

‎app/templates/ui/app/login/login.service.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
LoginService.$inject = ['$http', '$uibModal', '$q', '$rootScope', '$state',
88
'$stateParams', 'messageBoardService'];
9-
function LoginService($http, $uibModal, $q, $rootScope, $state, $stateParams, messageBoardService) {
9+
function LoginService($http, $uibModal, $q, $rootScope, $state,
10+
$stateParams, messageBoardService) {
11+
1012
var _loginMode = 'full'; // 'modal', 'top-right', or 'full'
1113
var _loginError;
1214
var _toStateName;

‎app/templates/ui/app/root/root.controller.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
ctrl.currentYear = new Date().getUTCFullYear();
1212
ctrl.messageBoardService = messageBoardService;
1313

14-
$scope.user = userService;
15-
16-
$scope.$watch('user.authenticated', function(newVal) {
17-
// do things that you care about
14+
$scope.$watch(userService.currentUser, function(newValue) {
15+
ctrl.currentUser = newValue;
1816
});
1917
}
2018
}());

0 commit comments

Comments
 (0)