kms 0.9.0 → 1.0.0

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

@@ -1,16 +1,2 @@
 .row
-  .col-lg-12 flow-init="{headers: setHeaders}" flow-files-submitted="$flow.upload()" flow-file-success="$file.msg = $message" flow-complete="$state.go('assets')"
-      /! The table listing the files available for upload/download
-      .form-group
-        button.btn.btn-primary flow-btn="" = I18n.t(:upload_assets)
-      table.table.table-striped.files.ng-cloak
-        tr ng-repeat="file in $flow.files"
-          td
-            img flow-img="file" width="50" height="50" ng-show="isImageType(file)"
-          td
-            | {{ file.name }}
-          td
-            .progress.progress-striped ng-class="{active: file.isUploading()}"
-              .progress-bar role="progressbar" ng-style="{width: (file.progress() * 100) + '%'}"
-          td
-            | {{ file.msg }}
+  ng-include src="'assets/form.html'"

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

@@ -5,7 +5,7 @@
         a href="#liquor" Liquor
       - Kms::HelpService.templates.each_with_index do |(engine_class, _),index|
         li role="presentation" ng-class="{active: isActiveTab(#{index + 1})}" ng-click="setActive(#{index + 1})"
-          a href="##{engine_class.engine_name}" = engine_class.engine_name.humanize
+          a href="##{engine_class.engine_name}" = engine_class.engine_name.humanize.gsub('Kms', 'APIQ')
     div class="tab-content"
       div role="tabpanel" class="tab-pane" ng-class="{active: isActiveTab(0)}" id="liquor"
         .widget

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

@@ -7,11 +7,10 @@ script type="text/ng-template" id="nodes_renderer.html"
       a ui-sref="pages.edit({id: node.id})" data-nodrag=""
         | {{node.title}} 
       i.fa.fa-cogs style="font-size:18px !important" ng-if="node.templatable"
+      i.fa.fa-exclamation-circle style="font-size:18px !important" ng-if="node.slug == '404'"
     div style="width:30%;float:left;height:30px;line-height:30px;"
       | {{ node.fullpath }}
     .btn-group.pull-right
-      /a.btn.btn-sm.btn-info data-nodrag="" ui-sref="pages.edit({id: node.id})"
-        /i.fa.fa-pencil
       a.btn.btn-sm.btn-danger data-nodrag="" ng-click="destroy(node)" style="margin-right: 8px;"
           i.fa.fa-times
   ol ui-tree-nodes="pages" ng-model="node.children" ng-class="{hidden: collapsed}"
@@ -19,16 +18,28 @@ script type="text/ng-template" id="nodes_renderer.html"
 
 
 
-.row
+.row ng-show="pages.length"
   .col-lg-12
     .widget
       .widget-header
         i.fa.fa-sitemap
         = Kms::Page.model_name.human(count: 1.1)
-        /a.pull-right href="#"  Manage
         a.btn.btn-sm.btn-primary.pull-right ui-sref="pages.new"
           = I18n.t("add_page")
       .widget-body.no-padding
         div ui-tree="pages" callbacks="treeOptions"
-          ol ui-tree-nodes="" ng-model="pages" id="tree-root"
+          ol ui-tree-nodes="" ng-model="pages" id="tree-root" data-nodrop-enabled="true"
             li ng-repeat="node in pages" ui-tree-node="" ng-include="'nodes_renderer.html'" data-id="{{node.id}}"
+.row ng-show="!pages.length"
+  .center-block
+    .jumbotron.vertical-center.text-center
+      .container
+        h1
+          span.fa-stack.fa-lg
+            i.fa.fa-circle.fa-stack-2x
+            i.fa.fa-sitemap.fa-stack-1x
+        p = I18n.t(:pages_description)
+        h5 ng-show="!templates.length" = I18n.t(:no_templates_yet)
+        p
+          a.btn.btn-primary.btn-lg ng-show="templates.length" ui-sref="pages.new" role="button" = I18n.t(:create_first_page)
+          a.btn.btn-primary.btn-lg ng-show="!templates.length" ui-sref="templates.new" role="button" = I18n.t(:create_first_template)

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

@@ -1,10 +1,9 @@
-.row
+.row ng-show="snippets.length"
   .col-lg-12
     .widget
       .widget-header
         i.fa.fa-bookmark
         = Kms::Snippet.model_name.human(count: 1.1)
-        /a.pull-right href="#"  Manage
         a.btn.btn-sm.btn-primary.pull-right ui-sref="snippets.new" ng-show="currentUser.admin"
           = I18n.t("add_snippet")
       .widget-body.no-padding
@@ -12,12 +11,24 @@
           table.table
             tbody
               tr ng-repeat="snippet in snippets"
-                td style="width: 80%"
+                td style="width: 70%"
                   a ui-sref="snippets.edit({id: snippet.id})"
                     | {{ snippet.name }}
+                td style="width: 20%"
+                  em
+                    | {{ snippet.slug }}
                 td
                   .btn-group.pull-right
-                    /a.btn.btn-sm.btn-info ui-sref="snippets.edit({id: snippet.id})" ng-show="currentUser.admin"
-                      /i.fa.fa-pencil
                     a.btn.btn-sm.btn-danger ng-click="destroy(snippet)" ng-show="currentUser.admin"
                       i.fa.fa-times
+.row ng-show="!snippets.length"
+  .center-block
+    .jumbotron.vertical-center.text-center
+      .container
+        h1
+          span.fa-stack.fa-lg
+            i.fa.fa-circle.fa-stack-2x
+            i.fa.fa-bookmark.fa-stack-1x
+        p = I18n.t(:snippets_description)
+        p
+          a.btn.btn-primary.btn-lg ui-sref="snippets.new" role="button" = I18n.t(:create_first_snippet)

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

@@ -1,23 +1,33 @@
-.row
+.row ng-show="templates.length"
   .col-lg-12
     .widget
       .widget-header
         i.fa.fa-support
         = Kms::Template.model_name.human(count: 1.1)
-        /a.pull-right href="#"  Manage
         a.btn.btn-sm.btn-primary.pull-right ui-sref="templates.new" ng-show="currentUser.admin"
-          = I18n.t("add_template")
+          = I18n.t(:add_template)
       .widget-body.no-padding
         .table-responsive
           table.table
             tbody
               tr ng-repeat="template in templates"
                 td style="width: 80%"
-                  a ui-sref="templates.edit({id: template.id})"
+                  a ui-sref="templates.edit({id: template.id})" ng-show="currentUser.admin"
+                    | {{ template.name }}
+                  span ng-hide="currentUser.admin"
                     | {{ template.name }}
                 td
                   .btn-group.pull-right
-                    /a.btn.btn-sm.btn-info ui-sref="templates.edit({id: template.id})" ng-show="currentUser.admin"
-                      /i.fa.fa-pencil
                     a.btn.btn-sm.btn-danger ng-click="destroy(template)" ng-show="currentUser.admin"
                       i.fa.fa-times
+.row ng-show="!templates.length"
+  .center-block
+    .jumbotron.vertical-center.text-center
+      .container
+        h1
+          span.fa-stack.fa-lg
+            i.fa.fa-circle.fa-stack-2x
+            i.fa.fa-support.fa-stack-1x
+        p = I18n.t(:templates_description)
+        p
+          a.btn.btn-primary.btn-lg ui-sref="templates.new" role="button" = I18n.t(:create_first_template)

data/app/assets/stylesheets/kms/application.css

@@ -11,7 +11,7 @@
  * file per style scope.
  *
  *= require bootstrap/dist/css/bootstrap
- *= require font-awesome/less/font-awesome
+ *= require font-awesome/scss/font-awesome
  *= require angular-ui-tree/dist/angular-ui-tree.min
  *= require codemirror/lib/codemirror
  *= require codemirror/addon/display/fullscreen
@@ -23,7 +23,7 @@
  *= require alertify/themes/alertify.bootstrap
  *= require angular-xeditable/dist/css/xeditable
  *= require ng-sortable/dist/ng-sortable
- *= require kms/responsive_dashboard
+ *= require rdash-ui/dist/css/rdash
  *= require kms/custom
  *= require application
  *= require_self

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

@@ -64,7 +64,16 @@ table td {
 }
 .CodeMirror {
   height: 500px;
+  font-size: 16px;
+  // pre {
+  //   font-family: 'casperregular';
+  // }
 }
+// .cm-s-default {
+//   .cm-tag, .cm-attribute, .cm-string, .cm-comment {
+//     font-family: monospace;
+//   }
+// }
 .assets-block {
   a.btn.add-asset {
     border: none;
@@ -86,3 +95,32 @@ table td {
 .widget .widget-header table i {
   margin-right: 0px;
 }
+.vertical-center {
+  min-height: 80%;  /* Fallback for browsers do NOT support vh unit */
+  min-height: 80vh; /* These two lines are counted as one :-)       */
+
+  display: flex;
+  align-items: center;
+}
+.jumbotron {
+  background-color: inherit;
+  i.fa-stack-1x {
+    color: #ff5274;
+  }
+  i.fa-stack-2x {
+    color: white;
+  }
+}
+.row.header .meta .page {
+  padding-top: 17px;
+}
+svg.logo {
+  vertical-align: top;
+  margin-right: -10px;
+}
+ul.sidebar .sidebar-main {
+  height: 75px;
+  a {
+    line-height: 70px;
+  }
+}

data/app/controllers/kms/assets_controller.rb

@@ -2,14 +2,16 @@ module Kms
   class AssetsController < ApplicationController
     load_and_authorize_resource
     skip_before_action :verify_authenticity_token, only: :ckeditor
+    wrap_parameters :asset, include: [:file, :text, :performing_plain_text]
 
     def index
-      render json: Asset.all.to_json(methods: [:filename, :url])
+      render json: Asset.all
     end
 
     def create
       @asset = Asset.new(asset_params)
       if @asset.save
+        # special json for ng-flow
         render json: {success: true, files: [@asset]}.to_json
       else
         render text: '', status: :unprocessable_entity
@@ -31,28 +33,25 @@ module Kms
 
     def update
       @asset = Asset.find(params[:id])
-      asset_params.merge!(text: params[:text], performing_plain_text: params[:performing_plain_text]) if params[:text]
-      @asset.update_attributes(asset_params)
-      render json: @asset.to_json
+      @asset.update(asset_params)
+      render json: @asset
     end
 
     def show
       @asset = Asset.find(params[:id])
-      attrs = {}
-      attrs.merge!(methods: [:filename, :text]) if @asset.stylesheet_or_javascript?
-      render json: @asset.to_json(attrs)
+      render json: @asset
     end
 
     def destroy
       @asset = Asset.find(params[:id])
       @asset.destroy
-      render json: @asset.to_json
+      head :no_content
     end
 
     protected
 
     def asset_params
-      params.require(:asset).permit!
+      params.require(:asset).permit(:file, :text, :performing_plain_text)
     end
   end
 end

data/app/controllers/kms/pages_controller.rb

@@ -4,37 +4,36 @@ module Kms
     wrap_parameters :page, include: [:title, :slug, :content, :published, :template_id, :templatable,:templatable_type,:position,:hidden, :parent_id]
 
     def index
-      #render json: Page.order("created_at asc").to_json(methods: :parent_id, except: :ancestry)
-      render json: Page.arrange_serializable(order: :position).to_json
+      render json: Page.arrange_serializable(order: :position)
     end
 
     def create
       @page = Page.new(page_params)
       if @page.save
-        render json: @page.to_json
+        head :no_content
       else
-        render json: @page.to_json(except: :ancestry, methods: :errors), status: :unprocessable_entity
+        render json: {errors: @page.errors}.to_json, status: :unprocessable_entity
       end
     end
 
     def update
       @page = Page.find(params[:id])
-      if @page.update_attributes(page_params)
-        render json: @page.to_json
+      if @page.update(page_params)
+        head :no_content
       else
-        render json: @page.to_json(except: :ancestry, methods: :errors), status: :unprocessable_entity
+        render json: {errors: @page.errors}.to_json, status: :unprocessable_entity
       end
     end
 
     def show
       @page = Page.find(params[:id])
-      render json: @page.to_json(methods: :parent_id, except: :ancestry)
+      render json: @page
     end
 
     def destroy
       @page = Page.find(params[:id])
       @page.destroy
-      render json: @page.to_json
+      head :no_content
     end
 
     def sorting
@@ -44,7 +43,7 @@ module Kms
         p.update_attribute(:position, index)
         sort(page["id"], page["children"]) if page["children"].present?
       end
-      render json: Page.arrange_serializable(order: :position).to_json
+      render json: Page.arrange_serializable(order: :position)
     end
 
     protected
@@ -61,7 +60,7 @@ module Kms
     end
 
     def page_params
-      params.require(:page).permit!
+      params.require(:page).permit(:title, :slug, :content, :published, :hidden, :template_id, :parent_id, :position, :templatable, :templatable_type)
     end
   end
 end

data/app/controllers/kms/public/pages_controller.rb

@@ -1,14 +1,15 @@
 module Kms
   class Public::PagesController < ActionController::Base
+    protect_from_forgery with: :exception
 
     before_action :eval_externals
 
     def show
-        page_result = Kms.template_manager.render(@page.register_id, @externals)
-        result   = Kms.template_manager.render(@template.register_id, @externals.
-                                merge(_inner_template: page_result))
+      page_result = Kms.template_manager.render(@page.register_id, @externals)
+      result = Kms.template_manager.render(@template.register_id,
+        @externals.merge(_inner_template: page_result))
 
-      render html: result.html_safe
+      render html: result.html_safe, status: (@page.not_found? ? :not_found : :ok)
     end
 
     protected

data/app/controllers/kms/public/search_controller.rb

@@ -1,5 +1,7 @@
 module Kms
   class Public::SearchController < ActionController::Base
+    protect_from_forgery with: :exception
+
     def search
       results = Page.advanced_search(params[:query]).to_drop#.split(' ').join('|').to_drop
       if params[:result_page] and @page = Page.find_by_fullpath(params[:result_page])

data/app/controllers/kms/settings_controller.rb

@@ -8,7 +8,7 @@ module Kms
 
     def update
       @settings = Settings.instance
-      if @settings.update_attributes(settings_params)
+      if @settings.update(settings_params)
         render json: @settings
       else
         render json: @settings.to_json(methods: :errors), status: :unprocessable_entity

data/app/controllers/kms/snippets_controller.rb

@@ -1,5 +1,6 @@
 module Kms
   class SnippetsController < ApplicationController
+    load_and_authorize_resource
     respond_to :json
 
     def index
@@ -38,7 +39,7 @@ module Kms
     protected
 
     def snippet_params
-      params.require(:snippet).permit!
+      params.require(:snippet).permit(:name, :slug, :content)
     end
   end
 end

data/app/controllers/kms/templates_controller.rb

@@ -2,21 +2,22 @@ module Kms
   class TemplatesController < ApplicationController
     load_and_authorize_resource
     def index
-      render json: Template.all.to_json
+      render json: Template.all
     end
 
     def create
       @template = Template.new(template_params)
+      @template.content = TemplateProcessor.new(@template).process
       if @template.save
-        render json: @template.to_json
+        head :no_content
       else
-        render json: @template.to_json(methods: :errors), status: :unprocessable_entity
+        render json: {errors: @template.errors}.to_json, status: :unprocessable_entity
       end
     end
 
     def update
       @template = Template.find(params[:id])
-      if @template.update_attributes(template_params)
+      if @template.update(template_params)
         render json: @template.to_json
       else
         render json: @template.to_json(methods: :errors), status: :unprocessable_entity
@@ -37,7 +38,7 @@ module Kms
     protected
 
     def template_params
-      params.require(:template).permit(:name,:content)
+      params.require(:template).permit(:name, :content)
     end
   end
 end

data/app/controllers/kms/users_controller.rb

@@ -3,32 +3,35 @@ module Kms
     before_action :authenticate_kms_user!
     load_and_authorize_resource
     skip_authorize_resource only: :kms_user
+    wrap_parameters :user, include: [:email, :password, :password_confirmation, :role]
 
     def index
-      render json: User.all.to_json(except: [:created_at, :updated_at], methods: :localized_role)
+      render json: User.all
     end
 
     def create
-      user_params.merge!(password: params[:password], password_confirmation: params[:password_confirmation]) if params[:password]
       @user = User.new(user_params)
-      @user.save
-      render json: @user.to_json
+      if @user.save
+        head :no_content
+      else
+        render json: {errors: @user.errors}.to_json, status: :unprocessable_entity
+      end
     end
 
-    def destroy 
+    def destroy
       @user = User.find(params[:id])
       @user.destroy
-      render json: @user.to_json
+      head :no_content
     end
 
     def kms_user
-      render json: current_kms_user.to_json
+      render json: current_kms_user
     end
 
     protected
 
     def user_params
-      params.require(:user).permit!
+      params.require(:user).permit(:email, :password, :password_confirmation, :role)
     end