From 75a9eda55e9f42e8083636eda7a383ef7f725a83 Mon Sep 17 00:00:00 2001 From: Amos Haviv Date: Tue, 20 May 2014 18:15:04 +0300 Subject: [PATCH] Moving to ng-bind fixing submenus --- .../views/create-article.client.view.html | 2 +- .../views/edit-article.client.view.html | 2 +- .../views/list-articles.client.view.html | 8 +- .../views/view-article.client.view.html | 9 +- .../core/services/menus.client.service.js | 12 +- .../core/views/header.client.view.html | 25 ++- .../modules/core/views/home.client.view.html | 153 +++++++++++------- .../settings/change-password.client.view.html | 2 +- .../settings/edit-profile.client.view.html | 2 +- .../users/views/signin.client.view.html | 2 +- .../users/views/signup.client.view.html | 2 +- 11 files changed, 125 insertions(+), 94 deletions(-) diff --git a/public/modules/articles/views/create-article.client.view.html b/public/modules/articles/views/create-article.client.view.html index fa2331374c..66634a689e 100644 --- a/public/modules/articles/views/create-article.client.view.html +++ b/public/modules/articles/views/create-article.client.view.html @@ -21,7 +21,7 @@

New Article

- {{error}} +
diff --git a/public/modules/articles/views/edit-article.client.view.html b/public/modules/articles/views/edit-article.client.view.html index 4d9bcbf243..897d3d9d88 100644 --- a/public/modules/articles/views/edit-article.client.view.html +++ b/public/modules/articles/views/edit-article.client.view.html @@ -21,7 +21,7 @@

Edit Article

- {{error}} +
diff --git a/public/modules/articles/views/list-articles.client.view.html b/public/modules/articles/views/list-articles.client.view.html index 9b7f014181..34f56a2ecf 100644 --- a/public/modules/articles/views/list-articles.client.view.html +++ b/public/modules/articles/views/list-articles.client.view.html @@ -4,12 +4,12 @@

Articles

- {{article.created | date:'medium'}} / {{article.user.displayName}} -

{{article.title}}

-

{{article.content}}

+ Posted on by +

+

-
+
No articles yet, why don't you create one?
\ No newline at end of file diff --git a/public/modules/articles/views/view-article.client.view.html b/public/modules/articles/views/view-article.client.view.html index b7170c18bf..15e7800998 100644 --- a/public/modules/articles/views/view-article.client.view.html +++ b/public/modules/articles/views/view-article.client.view.html @@ -1,8 +1,7 @@
-

{{article.title}}

+

-
@@ -12,9 +11,7 @@

{{article.title}}
- Posted on {{article.created | date:'mediumDate'}} by {{article.user.displayName}} + Posted on by -

- {{article.content}} -

+

\ No newline at end of file diff --git a/public/modules/core/services/menus.client.service.js b/public/modules/core/services/menus.client.service.js index c336d415e9..13511bdeb8 100644 --- a/public/modules/core/services/menus.client.service.js +++ b/public/modules/core/services/menus.client.service.js @@ -82,11 +82,11 @@ angular.module('core').service('Menus', [ this.menus[menuId].items.push({ title: menuItemTitle, link: menuItemURL, - mClass: menuClass || '', + menuClass: menuClass || '', uiRoute: menuItemUIRoute || ('/' + menuItemURL), isPublic: isPublic || this.menus[menuId].isPublic, roles: roles || this.defaultRoles, - subitems: [], + items: [], shouldRender: shouldRender }); @@ -103,7 +103,7 @@ angular.module('core').service('Menus', [ for (var itemIndex in this.menus[menuId].items) { if (this.menus[menuId].items[itemIndex].link === rootMenuItemURL) { // Push new submenu item - this.menus[menuId].items[itemIndex].subitems.push({ + this.menus[menuId].items[itemIndex].items.push({ title: menuItemTitle, link: menuItemURL, uiRoute: menuItemUIRoute || ('/' + menuItemURL), @@ -141,9 +141,9 @@ angular.module('core').service('Menus', [ // Search for menu item to remove for (var itemIndex in this.menus[menuId].items) { - for (var subitemIndex in this.menus[menuId].items[itemIndex].subitems) { - if (this.menus[menuId].items[itemIndex].subitems[subitemIndex].link === submenuItemURL) { - this.menus[menuId].items[itemIndex].subitems.splice(subitemIndex, 1); + for (var subitemIndex in this.menus[menuId].items[itemIndex].items) { + if (this.menus[menuId].items[itemIndex].items[subitemIndex].link === submenuItemURL) { + this.menus[menuId].items[itemIndex].items.splice(subitemIndex, 1); } } } diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html index e9514cc808..8cd0458b0c 100644 --- a/public/modules/core/views/header.client.view.html +++ b/public/modules/core/views/header.client.view.html @@ -12,16 +12,15 @@
+ \ No newline at end of file diff --git a/public/modules/core/views/home.client.view.html b/public/modules/core/views/home.client.view.html index ff43e72869..9f8d370d39 100644 --- a/public/modules/core/views/home.client.view.html +++ b/public/modules/core/views/home.client.view.html @@ -1,61 +1,96 @@
-
-
-
-
-

- That's some
140x140 -

-

- Open-Source Full-Stack Solution For MEAN Applications -

-

- Learn more -

-
-
-
-

Congrats! You've configured and run the sample application.

-

MEAN.JS is a web application boilerplate. That means start changing everything :-)

-

This sample application tracks users and articles. Click Signup to get started. To configure your app to work with your social accounts, edit the /config/strategies/*.js files.

-
-
-

MongoDB

-

MongoDB is a database. MongoDB's great manual, to get started with NoSQL and MongoDB.

-
-
-

Express

-

Express is an app server. Check out The Express Guide or StackOverflow for more info.

-
-
-

AngularJS

-

AngularJS is web app framework. Angular's webiste offers alot. The Thinkster Popular Guide and Egghead Videos are great resources.

-
-
-

Node.js

-

Node.js is a web server. Node's website and this stackOverflow thread, are great resources.

-
-
-
-
-

MEAN.JS Documentation

-

- Once you're familiar with the foundation technology, check out the MEAN.JS Documentation: -

-

-
-
Enjoy & Keep Us Updated, -
The MEAN.JS Team. -
-
-
-
-
+
+
+
+
+

+ 140x140 +

+

+ Open-Source Full-Stack Solution For MEAN Applications +

+

+ Learn more +

+
+
+
+

Congrats! You've configured and run the sample application.

+

MEAN.JS is a web application boilerplate, which means you should start changing everything :-)

+

This sample application tracks users and articles.

+ +
+
+

+ MongoDB +

+

MongoDB is a database. MongoDB's great manual, to get started with NoSQL and MongoDB.

+
+
+

+ Express +

+

Express is an app server. Check out The Express Guide or StackOverflow for more info.

+
+
+

+ AngularJS +

+

AngularJS is web app framework. Angular's webiste offers alot. The Thinkster Popular Guide and Egghead Videos are great resources.

+
+
+

+ Node.js +

+

Node.js is a web server. Node's website and this stackOverflow thread, are great resources.

+
+
+
+
+

MEAN.JS Documentation

+

+ Once you're familiar with the foundation technology, check out the MEAN.JS Documentation: +

+

+
+
Enjoy & Keep Us Updated, +
The MEAN.JS Team. +
+
+
+
+ \ No newline at end of file diff --git a/public/modules/users/views/settings/change-password.client.view.html b/public/modules/users/views/settings/change-password.client.view.html index 485cb7bd2a..9811011a53 100644 --- a/public/modules/users/views/settings/change-password.client.view.html +++ b/public/modules/users/views/settings/change-password.client.view.html @@ -22,7 +22,7 @@

Change your password

Password Changed Successfully
- {{error}} +
diff --git a/public/modules/users/views/settings/edit-profile.client.view.html b/public/modules/users/views/settings/edit-profile.client.view.html index 5006dc9f9e..ac0aad0510 100644 --- a/public/modules/users/views/settings/edit-profile.client.view.html +++ b/public/modules/users/views/settings/edit-profile.client.view.html @@ -26,7 +26,7 @@

Edit your profile

Profile Saved Successfully
- {{error}} +
diff --git a/public/modules/users/views/signin.client.view.html b/public/modules/users/views/signin.client.view.html index bdf035a6d4..0ddb6e5cf0 100644 --- a/public/modules/users/views/signin.client.view.html +++ b/public/modules/users/views/signin.client.view.html @@ -31,7 +31,7 @@

Or with your account

Sign up
- {{error}} +
diff --git a/public/modules/users/views/signup.client.view.html b/public/modules/users/views/signup.client.view.html index 7ba64817c0..10f84d74ac 100644 --- a/public/modules/users/views/signup.client.view.html +++ b/public/modules/users/views/signup.client.view.html @@ -43,7 +43,7 @@

Or with your email

Sign in
- {{error}} +