Merge pull request #6 from pencilblue/0.4.1

upgrade to 0.4.1 wysiwyg

Author: blakecallens

templates/admin/settings/home_page_settings.html

@@ -18,9 +18,7 @@
                     </div>
                     <div class="form-group">
                         <label>^loc_CONTENT^&nbsp;<span id="column_inches"></span></label>
-                        <div id="page_wysiwyg">
-                            ^wysiwyg^
-                        </div>
+                        <wysiwyg layout="layout" media="homePageSettings.page_media"></wysiwyg>
                     </div>
                 </div>
                 <div class="tab-pane" id="media">
@@ -37,5 +35,6 @@
 
     </div>
 </div>
+^tmp_admin=elements=wysiwyg_scripts^
 ^tmp_angular=admin=settings=home_page_settings^
 ^tmp_admin=footer^

templates/angular/admin/settings/home_page_settings.html

@@ -1,5 +1,6 @@
+<script type="text/javascript" src="/js/angular/directives/wysiwyg.js"></script>
 <script type="text/javascript">
-angular.module('pencilblueApp', ['uploadPhoto', 'inlineMedia'])
+angular.module('pencilblueApp', ['wysiwygElement', 'uploadPhoto', 'inlineMedia'])
 .controller('PencilBlueController', function($scope, $rootScope, $sce, $http) {
     ^angular_objects^
 
@@ -18,21 +19,18 @@
         }
         $scope.homePageSettings.page_media = media;
 
-        var wysId = $('.wysiwyg').attr('id').substring('wysiwg_'.length + 1);
-        getWYSIWYGLayout(wysId, function(layout) {
-            $scope.homePageSettings.page_layout = layout;
+        $scope.homePageSettings.page_layout = $scope.layout;
 
-            $scope.saving = true;
+        $scope.saving = true;
 
-            $http.post('/actions/admin/plugins/settings/portfolio/home_page', $scope.homePageSettings)
-            .success(function(result) {
-                $scope.successMessage = result.message;
-                $scope.saving = false;
-            })
-            .error(function(error, status) {
-                $scope.errorMessage = error.message;
-                $scope.saving = false;
-            });
+        $http.post('/actions/admin/plugins/settings/portfolio/home_page', $scope.homePageSettings)
+        .success(function(result) {
+            $scope.successMessage = result.message;
+            $scope.saving = false;
+        })
+        .error(function(error, status) {
+            $scope.errorMessage = error.message;
+            $scope.saving = false;
         });
     };
 });