From 4a483c95b554676c7d48bc2589ac502823dbdad1 Mon Sep 17 00:00:00 2001 From: will Date: Mon, 16 Nov 2015 16:48:22 -0500 Subject: [PATCH 01/13] first stage of transition to new post ui --- app/common/locales/en.json | 5 +- server/www/templates/posts/post-editor.html | 480 ++++++++------------ 2 files changed, 196 insertions(+), 289 deletions(-) diff --git a/app/common/locales/en.json b/app/common/locales/en.json index 77b5988606..02b0e83720 100644 --- a/app/common/locales/en.json +++ b/app/common/locales/en.json @@ -195,6 +195,7 @@ "timeline" : "Timeline" }, "post": { + "add_incident" : "Add Incident", "posts" : "Posts", "publish_for_you" : "Just you", "publish_for_everyone" : "Everyone", @@ -260,9 +261,9 @@ "author_email" : "Email", "form" : { "categories" : "Categories", - "description" : "Post Description", + "description" : "Description", "location" : "Location", - "title" : "Post Title", + "title" : "Title", "link" : { "name" : "Link Name", "url" : "Link url", diff --git a/server/www/templates/posts/post-editor.html b/server/www/templates/posts/post-editor.html index b1eeabc7d6..5d03b936b8 100644 --- a/server/www/templates/posts/post-editor.html +++ b/server/www/templates/posts/post-editor.html @@ -1,302 +1,208 @@
-
- -
- -
- -

post.modify.create_type

- post.modify.change_type - - -

post.modify.edit_type

- -
- -
- -
- -
-

- - -
- +
+
-

- - -
- - -

+

+
+
+ +
+ +
+

+ translate="{{'post.valid.title.' + error}}">

+ +
-
- -
- - - -
-
- -
- +
+
+
+ +
+
- - -
- +
+
+ post.modify.form.categories +
+ + +

+
- - - - - +
+ + +
+
+ +
+ +
+ + +
+ +
+ + + + + + + + +
+ +
+ + +
+ +
+ + + - -
- -
+ + - -
- + + + + + + + +
- - - - - - - - - - - - - -
-
- -

- - -
-
- -
-

{{'post.modify.contact_info' | translate}}

- - -

-

- - -

-

-
+

+ + + +
+
+
- From ee79e9e40753f70e210faec05e2513fba7e18504 Mon Sep 17 00:00:00 2001 From: will Date: Mon, 16 Nov 2015 17:20:00 -0500 Subject: [PATCH 02/13] added new add/edit ui --- server/www/templates/posts/post-editor.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/server/www/templates/posts/post-editor.html b/server/www/templates/posts/post-editor.html index 5d03b936b8..244404ec1b 100644 --- a/server/www/templates/posts/post-editor.html +++ b/server/www/templates/posts/post-editor.html @@ -1,4 +1,18 @@
+ + + +
From 504d0d410192f1dcfbb61b35ecd74d55a48175dd Mon Sep 17 00:00:00 2001 From: will Date: Mon, 16 Nov 2015 18:27:37 -0500 Subject: [PATCH 03/13] adding new revision of pattern library --- package.json | 2 +- server/www/templates/posts/detail.html | 10 ++- server/www/templates/posts/modify.html | 2 +- server/www/templates/posts/post-editor.html | 69 +++++++++++++++------ 4 files changed, 55 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 1c368d5ee8..d19f016543 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "ng-showdown": "rjmackay/ng-showdown#patch-1", "ngGeolocation": "rjmackay/ngGeolocation", "nvd3": "novus/nvd3#v1.7.1", - "platform-pattern-library": "ushahidi/platform-pattern-library#v3.1.0", + "platform-pattern-library": "ushahidi/platform-pattern-library#gh-pages", "selection-model": "jtrussell/angular-selection-model.git", "transifex": "^1.4.3", "underscore": "^1.7.0" diff --git a/server/www/templates/posts/detail.html b/server/www/templates/posts/detail.html index bfddc6fcaa..17993d5b25 100644 --- a/server/www/templates/posts/detail.html +++ b/server/www/templates/posts/detail.html @@ -1,11 +1,10 @@ -
-
-
-
+
+
+

{{post.title}}

-
+

{{publishedFor()}} @@ -112,5 +111,4 @@

post.location

-
diff --git a/server/www/templates/posts/modify.html b/server/www/templates/posts/modify.html index 830dab878f..5c2be46508 100644 --- a/server/www/templates/posts/modify.html +++ b/server/www/templates/posts/modify.html @@ -1,4 +1,4 @@ -
+
diff --git a/server/www/templates/posts/post-editor.html b/server/www/templates/posts/post-editor.html index 244404ec1b..c31a0033e5 100644 --- a/server/www/templates/posts/post-editor.html +++ b/server/www/templates/posts/post-editor.html @@ -1,30 +1,32 @@ - - - + -
-
+ + + +

post.add_incident

+
+

post.edit_incident

+
-
-
-
+
- +
+
+ +
+ +
diff --git a/server/www/templates/posts/post-editor.html b/server/www/templates/posts/post-editor.html index c31a0033e5..14c77ec659 100644 --- a/server/www/templates/posts/post-editor.html +++ b/server/www/templates/posts/post-editor.html @@ -1,6 +1,4 @@ - -
  • @@ -43,7 +41,7 @@

    post.edit_inc class="alert error" translate="{{'post.valid.title.' + error}}">

-
+
@@ -105,7 +102,6 @@

post.edit_inc translate="{{'post.valid.tags.' + error}}">

-
Date: Mon, 16 Nov 2015 22:39:25 -0500 Subject: [PATCH 06/13] fixed tag display --- server/www/templates/posts/detail.html | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/server/www/templates/posts/detail.html b/server/www/templates/posts/detail.html index 57bad683dc..526bbe864d 100644 --- a/server/www/templates/posts/detail.html +++ b/server/www/templates/posts/detail.html @@ -1,11 +1,11 @@ -
+
-
-
-

+
+
+

{{post.title}}

-
+

{{publishedFor()}} @@ -94,6 +94,14 @@

+
+ post.modify.form.categories +
+ +
+
Date: Mon, 16 Nov 2015 22:59:40 -0500 Subject: [PATCH 07/13] fixed looping to avoid including parent html and ensure css --- server/www/templates/posts/choose-form.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/server/www/templates/posts/choose-form.html b/server/www/templates/posts/choose-form.html index 5c3218b470..c115d76029 100644 --- a/server/www/templates/posts/choose-form.html +++ b/server/www/templates/posts/choose-form.html @@ -7,12 +7,10 @@

post.modify.intro
-
-
- {{form.name}} -
-
{{form.description}}
-
+
+ {{form.name}} +
+

From 3a194029ebe9fff2cdc92d97444363f91a6dd4e1 Mon Sep 17 00:00:00 2001 From: will Date: Mon, 16 Nov 2015 23:23:54 -0500 Subject: [PATCH 08/13] starting point for vertical tabs for steps --- app/common/locales/en.json | 1 + server/www/templates/posts/choose-form.html | 4 ++-- server/www/templates/posts/detail.html | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/common/locales/en.json b/app/common/locales/en.json index 3efc028a91..6562d40447 100644 --- a/app/common/locales/en.json +++ b/app/common/locales/en.json @@ -215,6 +215,7 @@ "unselect_all" : "Unselect All", "per_page" : "{{count}} posts", "post_details" : "Post Details", + "post" : "Post", "steps" : "This post's steps", "mark_complete" : "Mark as Complete", "complete" : "Complete", diff --git a/server/www/templates/posts/choose-form.html b/server/www/templates/posts/choose-form.html index c115d76029..eddab9aec3 100644 --- a/server/www/templates/posts/choose-form.html +++ b/server/www/templates/posts/choose-form.html @@ -7,8 +7,8 @@

post.modify.intro
-
- {{form.name}} +
+ {{form.name}}
diff --git a/server/www/templates/posts/detail.html b/server/www/templates/posts/detail.html index 526bbe864d..56a163a17d 100644 --- a/server/www/templates/posts/detail.html +++ b/server/www/templates/posts/detail.html @@ -82,6 +82,21 @@

+
From 6bec5ba1fe272065fcb2c53b50dba7edda512c3c Mon Sep 17 00:00:00 2001 From: will Date: Tue, 17 Nov 2015 14:47:57 -0500 Subject: [PATCH 09/13] fixed button alignment and adding stages --- server/www/templates/posts/detail.html | 4 ++-- server/www/templates/posts/post-editor.html | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/server/www/templates/posts/detail.html b/server/www/templates/posts/detail.html index 56a163a17d..49eeae5278 100644 --- a/server/www/templates/posts/detail.html +++ b/server/www/templates/posts/detail.html @@ -45,9 +45,9 @@

post.options

- +
+
- - -
-

post.add_incident

+
+ +
+ +
+ +

post.modify.create_type

+ post.modify.change_type + + +

post.modify.edit_type

+ +
+ +
+ +
+
-
- +

+ + +
+
-
-
-
- -
- -
-

+ + +
+ + +

+ translate="{{'post.valid.tags.' + error}}">

-
-
- -
- -
-
-
- -
-
- -
- +
+ +
+ + + +
+
+ +
+
-
-
- post.modify.form.categories -
- - -

+ + +
+
-
-
- - -
-
- -
- -
- -
- -
+ + - - + + - - + +
+ +
- -
- -
+ +
+ +
- -
- -
+ + - - + + - - + + - - + + - - + +
+
- -
-
+

-

+ +
+
+ +
+

{{'post.modify.contact_info' | translate}}

+ + +

+

+ + +

+

+
+
- - -
-
-
diff --git a/test/unit/common/directives/collection-selector-spec.js b/test/unit/common/directives/collection-selector-spec.js deleted file mode 100644 index 1d918dae87..0000000000 --- a/test/unit/common/directives/collection-selector-spec.js +++ /dev/null @@ -1,20 +0,0 @@ -var rootPath = '../../../../'; - -describe('Collection selector', function () { - - var $rootScope, - $scope; - - beforeEach(function () { - var testApp = angular.module('testApp', []) - .directive('collectionSelector', require('ROOT_PATH' + 'app/common/directives/collection-selector.js'); - - require(ROOT_PATH + 'test/unit/sinple-test-app-config')(testApp); - - angular.mock.module('testApp'); - }); - - beforeEach(inject(function (_rootScope_) { - $rootScope = _$rootScope_; - })); -}); From 71fd5b52a640561b60a33c6c9507c7c4077a4a9b Mon Sep 17 00:00:00 2001 From: will Date: Mon, 23 Nov 2015 16:47:50 -0500 Subject: [PATCH 13/13] Fixed linting, changed all instances of file upload to use new directive --- app/common/directives/custom-on-change.js | 2 +- app/common/directives/file-upload.js | 6 +++--- app/common/directives/first-time-config.js | 14 +++++--------- app/setting/directives/setting-editor-directive.js | 2 +- .../www/templates/partials/first-time-config.html | 3 ++- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/common/directives/custom-on-change.js b/app/common/directives/custom-on-change.js index e3056f1ab1..e97409eb16 100644 --- a/app/common/directives/custom-on-change.js +++ b/app/common/directives/custom-on-change.js @@ -7,5 +7,5 @@ angular.module('ushahidi.common.custom-on-change', []) var onChangeFunc = $scope.$eval($attrs.customOnChange); $element.bind('change', onChangeFunc); } - } + }; }); diff --git a/app/common/directives/file-upload.js b/app/common/directives/file-upload.js index 6cd53573b5..46eee1200a 100644 --- a/app/common/directives/file-upload.js +++ b/app/common/directives/file-upload.js @@ -13,9 +13,9 @@ angular.module('ushahidi.common.file-upload', []) function ( $scope ) { - $scope.uploadFile = function () { - $scope.fileContainer.file = event.target.files[0]; + $scope.uploadFile = function ($event) { + $scope.fileContainer.file = $event.target.files[0]; }; - }] + }] }; }); diff --git a/app/common/directives/first-time-config.js b/app/common/directives/first-time-config.js index b2f7110b60..b0df6ca7d2 100644 --- a/app/common/directives/first-time-config.js +++ b/app/common/directives/first-time-config.js @@ -30,6 +30,9 @@ function ( $scope.site = {}; $scope.saving_config = false; $scope.step = 'customize'; + $scope.fileContainer = { + file : null + }; // Load config, and open modal if first time login var checkConfig = function () { @@ -65,13 +68,6 @@ function ( $scope.modalOpen = false; }; - // @todo Copied from settings-editor. Move to shared directive - - // Get selected file - // @todo move file handling to own directive, or find a 3rd party implementation - $scope.fileNameChanged = function (element) { - $scope.file = element.files[0]; - }; $scope.clearHeader = function () { $scope.site.image_header = null; }; @@ -82,9 +78,9 @@ function ( var uploadHeaderImage = function () { var dfd = $q.defer(); - if ($scope.file) { + if ($scope.fileContainer.file) { var formData = new FormData(); - formData.append('file', $scope.file); + formData.append('file', $scope.fileContainer.file); $http.post( Util.apiUrl('/media'), diff --git a/app/setting/directives/setting-editor-directive.js b/app/setting/directives/setting-editor-directive.js index 7268022709..c2fffdd4a4 100644 --- a/app/setting/directives/setting-editor-directive.js +++ b/app/setting/directives/setting-editor-directive.js @@ -31,7 +31,7 @@ function ( $scope.saving_config = false; $scope.fileContainer = { file : null - } + }; $scope.site = ConfigEndpoint.get({ id: 'site' }); $scope.userSavedSettings = false; diff --git a/server/www/templates/partials/first-time-config.html b/server/www/templates/partials/first-time-config.html index e2f4d3a125..1117101e04 100644 --- a/server/www/templates/partials/first-time-config.html +++ b/server/www/templates/partials/first-time-config.html @@ -33,7 +33,8 @@

settings.customize_your_new_deployment

settings.appearance_header_image_instructions

- + +