fixes #678 - portfolio and email updated to new wysiwyg

pencilblue · Jul 7, 2015 · ba5a523 · ba5a523
1 parent 1f53a18
commit ba5a523
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 33 deletions.
diff --git a/plugins/pencilblue/templates/admin/site_settings/email.html b/plugins/pencilblue/templates/admin/site_settings/email.html
@@ -23,7 +23,7 @@
                         <label>^loc_VERIFICATION_CONTENT^</label>&nbsp;
                         <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="^loc_EMAIL_DIRECTIVES_DESCRIPTION^"></i>
                         <div id="email_wysiwyg">
-                            ^wysiwyg^
+                            <wysiwyg layout="layout"></wysiwyg>
                         </div>
                     </div>
                 </div>
@@ -99,5 +99,6 @@
         </fieldset>
     </form>
 </div>
+^tmp_admin=elements=wysiwyg_scripts^
 ^tmp_angular=admin=site_settings=email^
 ^tmp_admin=footer^
diff --git a/plugins/pencilblue/templates/angular/admin/site_settings/email.html b/plugins/pencilblue/templates/angular/admin/site_settings/email.html
@@ -1,5 +1,6 @@
+<script type="text/javascript" src="/js/angular/directives/wysiwyg.js"></script>
 <script type="text/javascript">
-    angular.module('pencilblueApp', [])
+    angular.module('pencilblueApp', ['wysiwygElement'])
     .controller('PencilBlueController', function($scope, $http, $sce) {
         ^angular_objects^
 
@@ -33,19 +34,16 @@
         $scope.saveEmailSettings = function() {
             $scope.saving = true;
 
-            var wysId = $('.wysiwyg').attr('id').substring('wysiwg_'.length + 1);
-            getWYSIWYGLayout(wysId, function(layout) {
-                $scope.emailSettings.verification_content = layout;
-
-                $http.post('/actions/admin/site_settings/email', $scope.emailSettings)
-                .success(function(result) {
-                    $scope.successMessage = result.message;
-                    $scope.saving = false;
-                })
-                .error(function(error, status) {
-                    $scope.errorMessage = error.message;
-                    $scope.saving = false;
-                });
+            $scope.emailSettings.verification_content = $scope.layout;
+
+            $http.post('/actions/admin/site_settings/email', $scope.emailSettings)
+            .success(function(result) {
+                $scope.successMessage = result.message;
+                $scope.saving = false;
+            })
+            .error(function(error, status) {
+                $scope.errorMessage = error.message;
+                $scope.saving = false;
             });
         };
 

diff --git a/plugins/portfolio/templates/admin/content/pages/page_form.html b/plugins/portfolio/templates/admin/content/pages/page_form.html
@@ -8,7 +8,7 @@
             <div class="tab-content">
                 <div class="tab-pane active" id="content">
                     <div class="form-group" ng-class="{'has-error': !isFieldValid(pageForm.url)}">
-                        <label>^loc_ARTICLE_URL^</label>
+                        <label>^loc_PAGE_URL^</label>
                         <div class="input-group">
                             <span class="input-group-addon">/page/</span>
                             <input type="text" name="url" class="form-control" placeholder="^loc_CUSTOM_URL^" ng-model="page.url" ng-change="resetUrlAvailability()" url-safe required></input>
@@ -29,6 +29,10 @@
                             <option ng-value="template.theme_uid + '|' + template.file" ng-repeat="template in templates" ng-bind="template.theme_name + ': ' + template.name" ng-selected="page.template === (template.theme_uid + '|' + template.file)"></option>
                         </select>
                     </div>
+                    <div class="form-group" ng-if="availableAuthors.length">
+                        <label>^loc_AUTHOR^</label>
+                        <select class="form-control" ng-model="page.author" ng-options="availableAuthor._id as availableAuthor.name for availableAuthor in availableAuthors"></select>
+                    </div>
                     ^tmp_admin=elements=hero_upload^
                     <div class="form-group" ng-class="{'has-error': !isFieldValid(pageForm.headline)}">
                         <label>^loc_HEADLINE^</label>
@@ -49,11 +53,9 @@
                         </div>
                         <div class="form_error" ng-if="!isFieldValid(pageForm.publish_date)">^loc_REQUIRED_FIELD^</div>
                     </div>
-                    <div class="form-group">
-                        <label>^loc_CONTENT^&nbsp;<span ng-bind="columnInches"></span></label>
-                        <div id="page_wysiwyg">
-                            ^wysiwyg^
-                        </div>
+                    <div class="form-group" ng-class="{'has-error': !isWysiwygValid(layout)}">
+                      <wysiwyg layout="layout" media="page.page_media"></wysiwyg>
+                      <div class="form_error" ng-if="!isWysiwygValid(layout)" style="margin-top: -1em">^loc_REQUIRED_FIELD^</div>
                     </div>
                 </div>
                 <div class="tab-pane" id="media">
@@ -79,6 +81,12 @@
                         <label>^loc_META_KEYWORDS^</label>
                         <input type="text" class="form-control" ng-model="page.meta_keywords" placeholder="^loc_META_KEYWORDS_PLACEHOLDER^"></input>
                     </div>
+                    <div class="form-group" ng-if="page.page_media.length">
+                        <label>^loc_THUMBNAIL^</label>
+                        <select class="form-control" ng-model="page.thumbnail">
+                            <option ng-value="media._id" ng-repeat="media in page.page_media" ng-selected="page.thumbnail === media._id" ng-bind="media.name" ng-if="media.media_type === 'image'"></option>
+                        </select>
+                    </div>
                 </div>
                 <a class="btn btn-default" href="/admin/content/pages">
                     <i class="fa fa-ban"></i>&nbsp;^loc_CANCEL^
@@ -103,11 +111,16 @@
                     </ul>
                 </div>
                 <div class="spacer"></div>
-                <label id="draft_info" ng-if="page.draft">^loc_DRAFT_SAVED^ <span id="draft_time">{{page.last_modified | date: 'yyyy-MM-dd HH:mm:ss'}}</span></label>
+                <label id="draft_info" ng-if="page._id">
+                  <span ng-if="page.draft">^loc_DRAFT_SAVED^</span>
+                  <span ng-if="!page.draft">^loc_LAST_SAVED^</span>&nbsp;
+                  <span id="draft_time">{{page.last_modified | date: 'yyyy-MM-dd HH:mm:ss'}}</span>
+                </label>
             </div>
             <div class="additions" style="display: none"></div>
         </fieldset>
     </form>
 </div>
+^tmp_admin=elements=wysiwyg_scripts^
 ^tmp_angular=admin=content=pages=page_form^
 ^tmp_admin=footer^
diff --git a/plugins/portfolio/templates/angular/admin/content/pages/page_form.html b/plugins/portfolio/templates/angular/admin/content/pages/page_form.html
@@ -1,12 +1,16 @@
+<script type="text/javascript" src="/js/angular/directives/wysiwyg.js"></script>
+<script type="text/javascript" src="/js/angular/filters/parsable_date.js"></script>
 <script type="text/javascript" src="/js/angular/services/form_validation.js"></script>
 <script type="text/javascript">
-    angular.module('pencilblueApp', ['inlineMedia', 'topicSelect', 'validation', 'uploadPhoto'])
-    .controller('PencilBlueController', function($scope, $rootScope, $sce, $http, $filter, $timeout, $window, validationService) {
+    angular.module('pencilblueApp', ['wysiwygElement', 'inlineMedia', 'topicSelect', 'parseDate', 'validation', 'uploadPhoto'])
+    .controller('PencilBlueController', function($rootScope, $scope, $sce, $http, $filter, $timeout, $window, validationService) {
         ^angular_objects^
         ^tmp_angular=admin=elements=is_field_valid^
+        ^tmp_angular=admin=elements=is_wysiwyg_valid^
 
         $scope.urlAvailable = null;
         $scope.page.publish_date = $filter('date')($scope.page.publish_date || new Date(), 'MM-dd-yyyy HH:mm');
+        $scope.page.page_media = $scope.page.page_media || [];
         $scope.layout = $sce.trustAsHtml($scope.page.page_layout);
         $scope.page.meta_keywords = $scope.page.meta_keywords ? $scope.page.meta_keywords.join(',') : '';
         $scope.editingObject = $scope.page;
@@ -98,8 +102,8 @@
         };
 
         $scope.getPageData = function(draft, cb) {
-            var pageData = JSON.parse(JSON.stringify($scope.page));
-            pageData.publish_date = (new Date($scope.page.publish_date)).getTime();
+            var pageData = angular.copy($scope.page);
+            pageData.publish_date = (new Date($filter('parsableDate')($scope.page.publish_date))).getTime();
             pageData.draft = draft ? 1 : 0;
             pageData.hero_image = $rootScope.photoValue;
 
@@ -113,14 +117,11 @@
                 topics.push($scope.page.page_topics[i]._id.toString());
             }
 
-            var wysId = $('.wysiwyg').attr('id').substring('wysiwg_'.length + 1);
-            getWYSIWYGLayout(wysId, function(layout) {
-                pageData.page_media = media;
-                pageData.page_topics = topics;
-                pageData.page_layout = layout;
+            pageData.page_media = media;
+            pageData.page_topics = topics;
+            pageData.page_layout = $scope.layout;
 
-                cb(pageData);
-            });
+            cb(pageData);
         };
 
         $scope.previewPage = function() {