kms 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4167d59e7151bdf01942747de925d31eef38c6d4
-  data.tar.gz: 44882c061a23bf582447083ce5973ff9fbb934af
+  metadata.gz: 706248cb2d7f607b5308dc373c44dcf914181239
+  data.tar.gz: 62c92d2c79550b7c38523df37e00ac90e179871e
 SHA512:
-  metadata.gz: f0b92c7cdc197f4d351105cc5ce3cfd13faed9ed725c3f707dee4f8324f79575a4dcf05e7567023a7162db5aebf9105eece7fc279ba1c19560c2df1e7652f6ed
-  data.tar.gz: 21df959541a30902e1bf145c3b3843512af0572a339d1bc196ac2bd17eafe8aeaa9ade20f89b8e1147f9559037199a54afb02aab30eeb1cd9a50e1a2c4aa887e
+  metadata.gz: 528337cf36325329bed39d101417d53338b6f46fe3d92d92a69528aab845ca27127a4bc08e19627cc10ed59c15f9adac9e866ac297f3fd2cba0e604ad5a92922
+  data.tar.gz: 56be7cf89aecc717a7e300abec0f4be70dd791976f42b1968ea79607d1880300152f3386bb1cdc776af0951781d3cd98e5880143389987ccdf18b8f3f29a839c

data/app/assets/javascripts/kms/application.js

@@ -44,6 +44,7 @@
 //= require "ng-alertify/ng-alertify"
 //= require "angular-xeditable/dist/js/xeditable"
 //= require "ng-sortable/dist/ng-sortable"
+//= require "angular-hotkeys/build/hotkeys.min"
 //= require "kms/application/module"
 //= require "kms/application/routes"
 //= require angular-rails-templates

data/app/assets/javascripts/kms/application/controllers/assets_controller.coffee.erb

@@ -1,4 +1,4 @@
-AssetsController = ($scope, $state, $cookieStore, $cookies, Restangular, $stateParams, Alertify, ErrorsService) ->
+AssetsController = ($scope, $state, $cookieStore, $cookies, Restangular, $stateParams, Alertify, ErrorsService, hotkeys) ->
 
   $scope.editorOptions = (asset)->
     lineNumbers: true
@@ -25,13 +25,23 @@ AssetsController = ($scope, $state, $cookieStore, $cookies, Restangular, $stateP
       $scope.asset = asset
       if /css|javascript/.test $scope.getAssetGroup(asset)
         $scope.asset.performing_plain_text = true
-  else
-    {}
+
+  hotkeys.add
+    combo: 'ctrl+s'
+    description: 'Saving an asset'
+    allowIn: ['INPUT', 'TEXTAREA']
+    callback: (event) ->
+      event.preventDefault()
+      $scope.update(event) if $scope.asset.id
+
+  $scope.handleUploadError = (file, message, flow) ->
+    Alertify.error ErrorsService.prepareErrorsString(JSON.parse(message).errors)
 
   $scope.update = ($event)->
     $scope.asset.put().then ->
       if $event.target.attributes['data-redirect']
         $state.go('assets')
+      Alertify.success('<%= I18n.t(:asset_successfully_updated) %>')
     ,(response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
@@ -77,4 +87,4 @@ AssetsController = ($scope, $state, $cookieStore, $cookies, Restangular, $stateP
 
 
 angular.module('KMS')
-    .controller('AssetsController', ['$scope', '$state', '$cookieStore', '$cookies', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', AssetsController])
+    .controller('AssetsController', ['$scope', '$state', '$cookieStore', '$cookies', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', 'hotkeys', AssetsController])

data/app/assets/javascripts/kms/application/controllers/pages_controller.coffee.erb

@@ -1,4 +1,4 @@
-PagesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Alertify, ErrorsService, TransliterationService) ->
+PagesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Alertify, ErrorsService, TransliterationService, hotkeys) ->
   $scope.editorOptions =
     filebrowserUploadUrl: '/kms/assets/ckeditor'
     entities: false
@@ -71,10 +71,19 @@ PagesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Aler
     if $scope.parentPages.length > 0 and $scope.page and !$scope.page.parent_id and !$stateParams.id
       $scope.page.parent_id = $scope.parentPages[0].id
 
+  hotkeys.add
+    combo: 'ctrl+s'
+    description: 'Saving a page'
+    allowIn: ['INPUT', 'SELECT', 'TEXTAREA']
+    callback: (event) ->
+      event.preventDefault()
+      if $scope.page.id then $scope.update(event) else $scope.create()
+
 
   $scope.create = ->
     $scope.store.post($scope.page).then ->
       $state.go('pages')
+      Alertify.success('<%= I18n.t(:page_successfully_created) %>')
     ,(response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
@@ -82,6 +91,7 @@ PagesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Aler
     $scope.page.put().then ->
       if $event.target.attributes['data-redirect']
         $state.go('pages')
+      Alertify.success('<%= I18n.t(:page_successfully_updated) %>')
     ,(response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
@@ -101,4 +111,4 @@ PagesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Aler
   }
 
 angular.module('KMS')
-    .controller('PagesController', ['$scope', '$state', '$cookieStore', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', 'TransliterationService', PagesController])
+    .controller('PagesController', ['$scope', '$state', '$cookieStore', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', 'TransliterationService', 'hotkeys', PagesController])

data/app/assets/javascripts/kms/application/controllers/snippets_controller.coffee.erb

@@ -1,4 +1,4 @@
-SnippetsController = ($scope, $state, Restangular, $stateParams, Alertify, ErrorsService) ->
+SnippetsController = ($scope, $state, Restangular, $stateParams, Alertify, ErrorsService, hotkeys) ->
   $scope.editorOptions =
     lineNumbers: true
     mode:'htmlmixed'
@@ -26,11 +26,20 @@ SnippetsController = ($scope, $state, Restangular, $stateParams, Alertify, Error
     $scope.store.get($stateParams.id).then (snippet)->
       $scope.snippet = snippet
   else
-    $scope.snippet = {}
+    $scope.snippet = {content: ''}
+
+  hotkeys.add
+    combo: 'ctrl+s'
+    description: 'Saving a snippet'
+    allowIn: ['INPUT', 'SELECT', 'TEXTAREA']
+    callback: (event) ->
+      event.preventDefault()
+      if $scope.snippet.id then $scope.update(event) else $scope.create()
 
   $scope.create = ->
     $scope.store.post($scope.snippet).then ->
       $state.go('snippets')
+      Alertify.success('<%= I18n.t(:snippet_successfully_created) %>')
     , (response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
@@ -38,6 +47,7 @@ SnippetsController = ($scope, $state, Restangular, $stateParams, Alertify, Error
     $scope.snippet.put().then ->
       if event.target.attributes['data-redirect']
         $state.go('snippets')
+      Alertify.success('<%= I18n.t(:snippet_successfully_updated) %>')
     ,(response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
@@ -47,4 +57,4 @@ SnippetsController = ($scope, $state, Restangular, $stateParams, Alertify, Error
         $scope.snippets = _.without($scope.snippets, snippet)
 
 angular.module('KMS')
-    .controller('SnippetsController', ['$scope', '$state', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', SnippetsController])
+    .controller('SnippetsController', ['$scope', '$state', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', 'hotkeys', SnippetsController])

data/app/assets/javascripts/kms/application/controllers/templates_controller.coffee.erb

@@ -1,4 +1,4 @@
-TemplatesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Alertify, ErrorsService) ->
+TemplatesController = ($scope, $state, $cookieStore, Restangular, $stateParams, Alertify, ErrorsService, hotkeys) ->
   $scope.editorOptions =
     lineNumbers: true
     mode:'htmlmixed'
@@ -26,11 +26,20 @@ TemplatesController = ($scope, $state, $cookieStore, Restangular, $stateParams,
     $scope.store.get($stateParams.id).then (template)->
       $scope.template = template
   else
-    $scope.template = {}
+    $scope.template = {name: '', content: ''}
+
+  hotkeys.add
+    combo: 'ctrl+s'
+    description: 'Saving a template'
+    allowIn: ['INPUT', 'SELECT', 'TEXTAREA']
+    callback: (event) ->
+      event.preventDefault()
+      if $scope.template.id then $scope.update(event) else $scope.create()
 
   $scope.create = ->
     $scope.store.post($scope.template).then ->
       $state.go('templates')
+      Alertify.success('<%= I18n.t(:template_successfully_created) %>')
     , (response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
@@ -38,6 +47,7 @@ TemplatesController = ($scope, $state, $cookieStore, Restangular, $stateParams,
     $scope.template.put().then ->
       if $event.target.attributes['data-redirect']
         $state.go('templates')
+      Alertify.success('<%= I18n.t(:template_successfully_updated) %>')
     ,(response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
@@ -48,4 +58,4 @@ TemplatesController = ($scope, $state, $cookieStore, Restangular, $stateParams,
 
 
 angular.module('KMS')
-    .controller('TemplatesController', ['$scope', '$state', '$cookieStore', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', TemplatesController])
+    .controller('TemplatesController', ['$scope', '$state', '$cookieStore', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', 'hotkeys', TemplatesController])

data/app/assets/javascripts/kms/application/controllers/users_controller.coffee

@@ -15,11 +15,11 @@ UsersController = ($scope, $state, $cookieStore, Restangular, $stateParams, Aler
     , (response)->
       Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
-  #$scope.update = ->
-    #$scope.user.put().then ->
-      #$state.go('users')
-    #,->
-      #console.log('bug')
+  $scope.update = ->
+    $scope.user.put().then ->
+      $state.go('users')
+    , (response) ->
+      Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
   $scope.destroy = (user)->
     if(confirm('<%= I18n.t(:are_you_sure) %>'))

data/app/assets/javascripts/kms/application/module.coffee

@@ -1,4 +1,8 @@
-angular.module('KMS', ['ui.bootstrap', 'ui.router', 'ngCookies', 'restangular', 'templates', 'ui.tree', 'ui.codemirror', 'flow', 'ui.select', 'ngSanitize', 'ngCkeditor', 'toggle-switch', 'angular-loading-bar', 'angularjs-dropdown-multiselect', 'Alertify', 'xeditable', 'as.sortable'])
+angular.module('KMS', ['ui.bootstrap', 'ui.router', 'ngCookies', 'restangular',
+  'templates', 'ui.tree', 'ui.codemirror', 'flow', 'ui.select',
+  'ngSanitize', 'ngCkeditor', 'toggle-switch', 'angular-loading-bar',
+  'angularjs-dropdown-multiselect', 'Alertify', 'xeditable', 'as.sortable', 'cfp.hotkeys'
+])
 
 angular.module('KMS').config ['$httpProvider', '$locationProvider', 'RestangularProvider', 'flowFactoryProvider', 'cfpLoadingBarProvider', ($httpProvider, $locationProvider, RestangularProvider, flowFactoryProvider, cfpLoadingBarProvider) ->
   cfpLoadingBarProvider.includeSpinner = false
@@ -10,7 +14,7 @@ angular.module('KMS').config ['$httpProvider', '$locationProvider', 'Restangular
 
   flowFactoryProvider.defaults =
     target: '/kms/assets.json'
-    permanentErrors: [404, 500, 501]
+    permanentErrors: [404, 422, 500, 501]
     maxChunkRetries: 1
     chunkSize: 50*1024*1024
     chunkRetryInterval: 5000

data/app/assets/javascripts/kms/application/routes.coffee.erb

@@ -138,6 +138,16 @@ angular.module('KMS').config ['$stateProvider', '$urlRouterProvider', ($statePro
                 controllerAs: 'users',
                 templateUrl: 'users/new.html',
         })
+        .state('users.edit', {
+          url: '/:id/edit',
+          views:
+            "header@":
+              template: "<%= I18n.t(:edit_user) %>"
+            "@":
+              controller: 'UsersController',
+              controllerAs: 'users',
+              templateUrl: 'users/edit.html',
+        })
         .state('snippets', {
             url: '/kms/snippets',
             views:

data/app/assets/javascripts/templates/assets/edit.html.slim

@@ -7,7 +7,8 @@
       .btn-group
         button.btn.btn-default type="submit" data-redirect="true" ng-click="update($event)" = I18n.t(:update_asset)
         button.btn.btn-default type="submit" ng-click="update($event)" = I18n.t(:update_asset_and_continue)
-  .center-block ng-unless="asset.performing_plain_text" flow-init="{headers: setHeaders, singleFile: true, uploadMethod: 'PUT', target: updateTarget, initFileFn: initFlowFile}" flow-files-submitted="$flow.upload()" flow-file-success="$file.msg = $message" flow-complete="$state.go('assets')" flow-drop=""
+        ng-include src="'shared/hotkey_notification.html'"
+  .center-block ng-unless="asset.performing_plain_text" flow-init="{headers: setHeaders, singleFile: true, uploadMethod: 'PUT', target: updateTarget, initFileFn: initFlowFile}" flow-files-submitted="$flow.upload()" flow-file-success="$file.msg = $message" flow-complete="$state.go('assets')" flow-drop="" flow-error="handleUploadError( $file, $message, $flow )"
     .jumbotron.vertical-center.text-center
       .container
         h1

data/app/assets/javascripts/templates/assets/form.html.slim

@@ -1,4 +1,4 @@
-.center-block flow-init="{headers: setHeaders}" flow-files-submitted="$flow.upload()" flow-file-success="$file.msg = $message" flow-complete="$state.go('assets')" flow-drop=""
+.center-block flow-init="{headers: setHeaders}" flow-files-submitted="$flow.upload()" flow-file-success="$file.msg = $message" flow-complete="$state.go('assets')" flow-drop="" flow-error="handleUploadError( $file, $message, $flow )"
   .jumbotron.vertical-center.text-center
     .container
       h1

data/app/assets/javascripts/templates/pages/edit.html.slim

@@ -5,3 +5,4 @@
       .btn-group
         button.btn.btn-default type="submit" data-redirect="true" ng-click="update($event)" = I18n.t(:update_page)
         button.btn.btn-default type="submit" ng-click="update($event)" = I18n.t(:update_page_and_continue)
+        ng-include src="'shared/hotkey_notification.html'"

data/app/assets/javascripts/templates/shared/hotkey_notification.html.slim

@@ -0,0 +1,6 @@
+span.btn.hotkey-notification
+  = I18n.t(:or_hit)
+  span.label.label-info Ctrl
+  |  + 
+  span.label.label-info S
+  = I18n.t(:while_your_cursor_in_input)

data/app/assets/javascripts/templates/snippets/edit.html.slim

@@ -5,3 +5,4 @@
       .btn-group
         button.btn.btn-default type="submit" data-redirect="true" ng-click="update($event)" = I18n.t(:update_snippet)
         button.btn.btn-default type="submit" ng-click="update($event)" = I18n.t(:update_snippet_and_continue)
+        ng-include src="'shared/hotkey_notification.html'"

data/app/assets/javascripts/templates/templates/edit.html.slim

@@ -5,3 +5,4 @@
       .btn-group
         button.btn.btn-default type="submit" data-redirect="true" ng-click="update($event)" = I18n.t(:update_template)
         button.btn.btn-default type="submit" ng-click="update($event)" = I18n.t(:update_template_and_continue)
+        ng-include src="'shared/hotkey_notification.html'"

data/app/assets/javascripts/templates/users/edit.html.slim

@@ -0,0 +1,5 @@
+.row
+  .col-lg-12
+    form role="form" ng-submit="update()"
+      ng-include src="'users/form.html'"
+      button.btn.btn-default type="submit" = I18n.t(:update_user)

data/app/assets/javascripts/templates/users/form.html.slim

@@ -3,12 +3,13 @@
   input#email.form-control type="email" ng-model="user.email" required=""
 .form-group
   label for="password" = Kms::User.human_attribute_name(:password)
-  input#password.form-control type="password" ng-model="user.password" required=""
+  input#password.form-control type="password" ng-model="user.password" ng-attr-required="{{user.id ? undefined : ''}}"
 .form-group
   label for="password_confirmation" = Kms::User.human_attribute_name(:password_confirmation)
-  input#password_confirmation.form-control type="password" ng-model="user.password_confirmation" required=""
+  input#password_confirmation.form-control type="password" ng-model="user.password_confirmation" ng-attr-required="{{user.id ? undefined : ''}}"
 .form-group
   label for="role" = Kms::User.human_attribute_name(:role)
   select#role.form-control ng-model="user.role" required=""
     - Kms::User::ROLES.each do |role|
       option value=role.to_s = I18n.t("roles.#{role.to_s}")
+  small = I18n.t(:roles_description)

data/app/assets/javascripts/templates/users/index.html.slim

@@ -13,7 +13,8 @@
             tbody
               tr ng-repeat="user in users"
                 td style="width: 80%"
-                  | {{ user.email }}
+                  a ui-sref="users.edit({id: user.id})"
+                    | {{ user.email }}
                 td
                   | {{ user.localized_role }}
                 td

data/app/assets/stylesheets/kms/custom.css.scss

@@ -124,3 +124,13 @@ ul.sidebar .sidebar-main {
     line-height: 70px;
   }
 }
+.hotkey-notification:active {
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+ul.sidebar .sidebar-list.active a {
+  color: #fff;
+  border-left: 3px solid #ff5274;
+  text-indent: 22px;
+  background: #2d3e63;
+}

data/app/controllers/kms/assets_controller.rb

@@ -14,7 +14,7 @@ module Kms
         # special json for ng-flow
         render json: {success: true, files: [@asset]}.to_json
       else
-        render text: '', status: :unprocessable_entity
+        render json: {errors: @asset.errors}.to_json, status: :unprocessable_entity
       end
     end
 
@@ -33,8 +33,11 @@ module Kms
 
     def update
       @asset = Asset.find(params[:id])
-      @asset.update(asset_params)
-      render json: @asset
+      if @asset.update(asset_params)
+        render json: @asset
+      else
+        render json: {errors: @asset.errors}.to_json, status: :unprocessable_entity
+      end
     end
 
     def show

data/app/controllers/kms/users_controller.rb

@@ -18,6 +18,20 @@ module Kms
       end
     end
 
+    def update
+      @user = User.find(params[:id])
+      if @user.update(user_params)
+        head :no_content
+      else
+        render json: {errors: @user.errors}.to_json, status: :unprocessable_entity
+      end
+    end
+
+    def show
+      @user = User.find(params[:id])
+      render json: @user
+    end
+
     def destroy
       @user = User.find(params[:id])
       @user.destroy

data/app/services/kms/resource_service.rb

@@ -4,6 +4,8 @@ module Kms
       {}
     end
 
+    NON_TEMPLATABLE_CLASSES = [Page, Template, Asset, User, Snippet].freeze
+
     def self.register(group, resource, tab_icon_class)
       self.resources[group] ||= {}
       self.resources[group][resource] = tab_icon_class
@@ -14,7 +16,7 @@ module Kms
     end
 
     def self.external_resources_hash
-      self.resources.values.map(&:keys).flatten.reject {|r| [Page, Template, Asset, User].include?(r)}.map do |resource_class|
+      self.resources.values.map(&:keys).flatten.reject {|r| NON_TEMPLATABLE_CLASSES.include?(r)}.map do |resource_class|
         {type: resource_class.name, title: resource_class.model_name.human}
       end
     end

data/app/views/layouts/kms/kms.html.erb

@@ -72,7 +72,7 @@
           <% end %>
           <% resources.each do |resource_class, tab_icon_class| %>
             <% if can? :index, resource_class %>
-              <li class="sidebar-list">
+              <li class="sidebar-list" ui-sref-active-eq="active">
                 <a ui-sref="<%= defined?(Kms::Model) && resource_class.is_a?(Kms::Model) ? "models.entries({modelId: #{resource_class.name}})" : resource_class.name.demodulize.tableize %>" title="<%= resource_class.model_name.human(count: 1.1) %>">
                   <%= truncate(resource_class.model_name.human(count: 1.1), length: 22) %>
                   <span class="menu-icon fa <%= tab_icon_class %>"></span>

data/config/initializers/devise.rb

@@ -9,6 +9,15 @@ module Kms
         new_kms_user_session_path
       end
 
+      # You need to override respond to eliminate recall
+      def respond
+        if http_auth?
+          http_auth
+        else
+          redirect
+        end
+      end
+
     end
 
   end

data/config/locales/en.yml

@@ -10,11 +10,15 @@ en:
   new_template: "New Template"
   edit_template: "Edit Template"
   update_template: "Update template"
+  template_successfully_created: "Template successfully created"
+  template_successfully_updated: "Template successfully updated"
   add_page: "Add page"
   create_first_page: "Create first page"
   new_page: "New Page"
   edit_page: "Edit Page"
   update_page: "Update page"
+  page_successfully_created: "Page successfully created"
+  page_successfully_updated: "Page successfully updated"
   update_page_and_continue: "Update page and continue"
   update_template_and_continue: "Update template and continue"
   update_asset_and_continue: "Update asset and continue"
@@ -23,15 +27,20 @@ en:
   new_asset: "New Asset"
   edit_asset: "Edit Asset"
   update_asset: "Update asset"
+  asset_successfully_updated: "Asset successfully updated"
   upload_assets: "Upload assets"
   add_user: "Add user"
   new_user: "New User"
+  edit_user: "Edit User"
+  update_user: "Update user"
   toggle_fullscreen_mode_instruction: "Press F11 when cursor is in the editor to toggle full screen editing. ESC can also be used to exit full screen editing."
   add_snippet: "Add snippet"
   create_first_snippet: "Create first snippet"
   new_snippet: "New Snippet"
   edit_snippet: "Edit Snippet"
   update_snippet: "Update snippet"
+  snippet_successfully_created: "Snippet successfully created"
+  snippet_successfully_updated: "Snippet successfully updated"
   documentation: "Documentation"
   need_help: "Need help?"
   settings: "Settings"
@@ -52,6 +61,9 @@ en:
   snippets_description: "Snippets are pieces of HTML that you could include in templates or pages"
   assets_description: "Upload stylesheets, javascripts, images and other files here (you can even pick multiple)"
   assets_drop_description: "or just drag and drop them"
+  roles_description: "Admins can manage any content. Content managers have access only to \"Pages\" and \"Assets\" under \"Content Management\" section (but also have access to other sections). The second difference is Admins see pages content in html editor, Content Managers - in WYSIWYG editor"
+  or_hit: "or hit "
+  while_your_cursor_in_input: " while your cursor in input"
   roles:
     admin: "Admin"
     content_manager: "Content manager"