billy_cms 0.0.15 → 0.0.17

data/app/assets/javascripts/billy_cms/frontend/editing.es6

@@ -7,9 +7,14 @@ BillyCms.API_BASE_URL = '/billy_cms/api/pages';
 BillyCms.Editing = {
     isEditModeOn: false,
 
-    setEditMode(state) {
+    setEditMode(state, element) {
         this.isEditModeOn = state;
-        var editableFields = $('[contenteditable]');
+        var editableFields;
+        if (element) {
+            editableFields = $(element).parents('.page-wrapper').first().find('[contenteditable]');
+        } else {
+            editableFields = $('[contenteditable]');
+        }
         var container = $('.container');
         if (state === true) {
             container.addClass('edit-mode-enabled');
@@ -44,7 +49,7 @@ BillyCms.Editing = {
 
 $(function() {
     $('.billycms_edit_button').on('click', function() {
-        BillyCms.Editing.setEditMode(!BillyCms.Editing.isEditModeOn);
+        BillyCms.Editing.setEditMode(!BillyCms.Editing.isEditModeOn, this);
     });
 
     $('.page-content-binary input[type=file]').on('change', function(evt) {

data/app/assets/stylesheets/billy_cms/backend/index.scss

@@ -31,4 +31,8 @@ span.delete-link {
 	&:hover {
 		color: #ff1e2e;
 	}
+}
+
+md-tab-content > div {
+	display: flex;
 }

data/app/assets/stylesheets/billy_cms/editmode.scss

@@ -5,10 +5,6 @@
   font-size: 13px;
   background-color: #C1C1C1;
   color: #fff;
-  position: absolute;
-  font-weight: 100px;
-  left: 1em;
-  min-width: 85px;
   outline: none;
     &:hover {
       background-color: #E6B0B0;
@@ -24,8 +20,13 @@
     }
 }
 
+.billycms-edit-page-buttons {
+  border-top: 1px solid #000;
+  padding-top: .5em;
+}
+
 .edit-mode-enabled {
-    [contenteditable], .page-content-binary {
+    [contenteditable=true], .page-content-binary {
         border: 1px solid #F3B9B9;
         background-color: #FFF0F0;
         min-height: 1em;
@@ -70,8 +71,6 @@
 
 .billycms_settings_button {
   @include editbutton;
-  top: 12em;
-  z-index: 100;
   &::before {
     content: 'Seiteneinstellungen';
   }

data/app/controllers/api/page_types_controller.rb

@@ -7,5 +7,26 @@ module Api
         def show
             render json: BillyCms::PageType.find(params[:id])
         end
+
+        def create
+            render nothing: true, status: 400 unless params[:page_type]
+            page_type = BillyCms::PageType.new page_type_params
+            if page_type.save
+                render json: {
+                    success: true,
+                    page_type: page_type
+                }
+            else
+                render json: {
+                    success: false,
+                    error: page_type.error_messages,
+                }, status: 500
+            end
+        end
+
+    private
+        def page_type_params
+            params.require(:page_type).permit(:title, :name) if current_user.admin?
+        end
     end
 end

data/app/controllers/api/pages_controller.rb

@@ -9,7 +9,7 @@ module Api
     end
 
     def update
-      render nothing: true, status: 400 unless params[:page]
+      return render nothing: true, status: 400 unless params[:page]
       page = BillyCms::Page.find params[:id]
       if page.update_attributes page_params
         render json: {
@@ -25,7 +25,7 @@ module Api
     end
 
     def create
-      render nothing: true, status: 400 unless params[:page]
+      return render nothing: true, status: 400 unless params[:page]
       page =  BillyCms::Page.new page_params
       if page.save
         render json: {
@@ -41,8 +41,9 @@ module Api
     end
 
     def destroy
-      render :nothing, status: 400 unless params[:id]
-      if BillyCms::Page.delete(params[:id])
+      return render :nothing, status: 400 unless params[:id]
+      return render :nothing, status: 404 unless page = BillyCms::Page.where(id: params[:id]).first
+      if page.destroy
         render json: {
             success: true
         }

data/app/models/billy_cms/page.rb

@@ -7,7 +7,7 @@ module BillyCms
     extend FriendlyId
     friendly_id :title, use: :slugged
 
-    has_many :pages, class_name: 'Page', foreign_key: :parent_page_id
+    has_many :pages, class_name: 'Page', foreign_key: :parent_page_id, :dependent => :destroy
     belongs_to :parent_page, class_name: 'Page', foreign_key: :parent_page_id, optional: true
 
     def cms_path

data/app/views/billy_cms/backend/_page_types.html.erb

@@ -1,50 +1,74 @@
 <div layout="row" layout-wrap>
-  <aside flex="30">
-    <md-list>
-      <md-list-item class="md-2-line" ng-repeat="pageType in app.allPageTypes" ng-click="ptctrl.selectPageType(pageType)" ng-class="{selected: pageType.id == ptctrl.selectedPageType.id}">
-        <div class="md-list-item-text" layout="column">
-          <h3>{{ pageType.title }}</h3>
-          <h4>{{ pageType.name }}</h4>
-        </div>
-      </md-list-item>
-    </md-list>
-  </aside>
-  <form flex="70" ng-show="ptctrl.selectedPageType" ng-submit="ptctrl.savePageType(ptctrl.selectedPageType)">
-    <md-toolbar>
-      <div class="md-toolbar-tools">
-        <h3>
-          <span>{{ptctrl.selectedPageType.title}}</span>
-        </h3>
-      </div>
-    </md-toolbar>
-    <md-content>
-      <md-input-container class="md-block">
-        <label>ID: {{ptctrl.selectedPageType.id}}</label>
-      </md-input-container>
-      <md-input-container class="md-block">
-        <label>Titel</label>
-        <input type="text" ng-model="ptctrl.selectedPageType.title" />
-      </md-input-container>
-      <md-input-container class="md-block">
-        <label>Name</label>
-        <input type="text" ng-model="ptctrl.selectedPageType.name" />
-      </md-input-container>
-    </md-content>
-    <h2>
-      Zusätzliche Eigenschaften
-    </h2>
-    <md-input-container>
-      <label>Mögliche zusätzliche Eigenschaft hinzufügen:</label>
-      <md-select ng-model="ptctrl.attributeIdToAdd" ng-change="ptctrl.addAtributeToSelectedPageType()">
-        <md-option ng-repeat="attribute in ptctrl.attributesAddableToSelectedPageType() track by $index" value="{{attribute.id}}">
-          {{attribute.title}} ({{attribute.name}})
-        </md-option>
-      </md-select>
-    </md-input-container>
-    <ul>
-      <li ng-repeat="attribute in ptctrl.selectedPageType.additional_attributes">
-        {{attribute.title}} &nbsp; <span class="delete-link" ng-click="ptctrl.removeAttribute(attribute)">entfernen</span>
-      </li>
-    </ul>
-  </form>
+  <md-tabs md-dynamic-height md-border-bottom md-selected="ptctrl.selectedTabIndex" layout="column" flex="100" style="display: flex">
+    <md-tab label="Alle Seitentypen">
+      <aside flex="30">
+        <md-list>
+          <md-list-item class="md-2-line" ng-repeat="pageType in app.allPageTypes" ng-click="ptctrl.selectPageType(pageType)" ng-class="{selected: pageType.id == ptctrl.selectedPageType.id}">
+            <div class="md-list-item-text" layout="column">
+              <h3>{{ pageType.title }}</h3>
+              <h4>{{ pageType.name }}</h4>
+            </div>
+          </md-list-item>
+        </md-list>
+      </aside>
+      <form flex="70" ng-show="ptctrl.selectedPageType" ng-submit="ptctrl.savePageType(ptctrl.selectedPageType)">
+        <md-toolbar>
+          <div class="md-toolbar-tools">
+            <h3>
+              <span>{{ptctrl.selectedPageType.title}}</span>
+            </h3>
+          </div>
+        </md-toolbar>
+        <md-content>
+          <md-input-container class="md-block">
+            <label>ID: {{ptctrl.selectedPageType.id}}</label>
+          </md-input-container>
+          <md-input-container class="md-block">
+            <label>Titel</label>
+            <input type="text" ng-model="ptctrl.selectedPageType.title" />
+          </md-input-container>
+          <md-input-container class="md-block">
+            <label>Name</label>
+            <input type="text" ng-model="ptctrl.selectedPageType.name" />
+          </md-input-container>
+        </md-content>
+        <h2>
+          Zusätzliche Eigenschaften
+        </h2>
+        <md-input-container>
+          <label>Mögliche zusätzliche Eigenschaft hinzufügen:</label>
+          <md-select ng-model="ptctrl.attributeIdToAdd" ng-change="ptctrl.addAtributeToSelectedPageType()">
+            <md-option ng-repeat="attribute in ptctrl.attributesAddableToSelectedPageType() track by $index" value="{{attribute.id}}">
+              {{attribute.title}} ({{attribute.name}})
+            </md-option>
+          </md-select>
+        </md-input-container>
+        <ul>
+          <li ng-repeat="attribute in ptctrl.selectedPageType.additional_attributes">
+            {{attribute.title}} &nbsp; <span class="delete-link" ng-click="ptctrl.removeAttribute(attribute)">entfernen</span>
+          </li>
+        </ul>
+      </form>
+    </md-tab>
+
+    <md-tab label="Seitentyp erstellen">
+      <aside flex="30"></aside>
+      <form flex="70" ng-submit="ptctrl.createPageType(ptctrl.newPageType)">
+        <div class="md-toolbar-tools"><h3>Neuer Seitentyp</h3></div>
+        <md-content>
+          <md-input-container class="md-block">
+            <label>Titel</label>
+            <input type="text" ng-model="ptctrl.newPageType.title" />
+          </md-input-container>
+          <md-input-container class="md-block">
+            <label>Name</label>
+            <input type="text" ng-model="ptctrl.newPageType.name" />
+          </md-input-container>
+          <md-input-container>
+            <input type="submit" value="speichern" aria-label="neuen Seitentypen speichern" />
+          </md-input-container>
+        </md-content>
+      </form>
+    </md-tab>
+  </md-tabs>
 </div>

data/lib/billy_cms/version.rb

@@ -1,3 +1,3 @@
 module BillyCms
-  VERSION = "0.0.15"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billy_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - unsdrei GbR
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler