version bumped to 0.9.18

kinolaev · Aug 31, 2014 · 5e0a4ed · 5e0a4ed
1 parent 056b084
commit 5e0a4ed
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-### W.I.P.
+### 0.9.18 (Aug 31, 2014)
 
  + Added duplicate collections and regions
  + Added usage nice urls for the backend (if possible)

diff --git a/README.md b/README.md
@@ -19,11 +19,7 @@ Manage content like collections, regions, forms and galleries which you can reus
 * PDO + SQLite (or MongoDB)
 * GD extension
 
-make also sure that
-
- $_SERVER['DOCUMENT_ROOT'] + $_SERVER["PATH_INFO"]
-
-exists and is set correctly
+make also sure that <code>$_SERVER['DOCUMENT_ROOT']</code> exists and is set correctly.
 
 
 ### Installation
@@ -41,14 +37,14 @@ Embedding Cockpit is really easy. Just include the following snippet anywhere yo
 
 ```php
 // make cockpit api available
-require('path2cockpit/bootstrap.php');
+require('path/to/cockpit/bootstrap.php');
 ```
 
 **Regions**
 
 Render regions api:
 
-```php
+```html
 <div><?php region("address") ?></div>
 <div><?=get_region("address") ?></div>
 ```
@@ -57,7 +53,7 @@ Render regions api:
 
 Loop over collection data:
 
-```php
+```html
 <?php foreach(collection("posts")->find(["active"=>1]) as $post): ?>
  <div class="post">
  <h3><?=$post["title"];?></h3>

diff --git a/assets/css/uikit.cockpit.min.css b/assets/css/uikit.cockpit.min.css
diff --git a/assets/css/uikit.cockpit/nav.less b/assets/css/uikit.cockpit/nav.less
@@ -134,6 +134,17 @@
 .hook-nav-dropdown-divider() {}
 
 
+.uk-nav-dropdown > li.uk-danger > a,
+.uk-nav-dropdown > li.uk-danger > a { // 1
+ color: @text-danger-color;
+}
+
+.uk-nav-dropdown > li.uk-danger > a:hover,
+.uk-nav-dropdown > li.uk-danger > a:focus { // 1
+ background: @text-danger-color;
+ color: #fff;
+}
+
 // Modifier `uk-nav-navbar`
 // ========================================================================
 
@@ -194,4 +205,4 @@
 // Miscellaneous
 // ========================================================================
 
-.hook-nav-misc() {}
+.hook-nav-misc() {}
diff --git a/assets/js/angular/fields/codearea.js b/assets/js/angular/fields/codearea.js
@@ -53,6 +53,7 @@
  matchTags: true,
  autoCloseBrackets: true,
  autoCloseTags: true,
+ smartIndent: false,
  mode: 'text',
  theme: 'pastel-on-dark'
  }, scope.$eval(attrs.codearea));

diff --git a/assets/vendor/codemirror/codemirror.js b/assets/vendor/codemirror/codemirror.js
diff --git a/modules/core/Collections/views/index.php b/modules/core/Collections/views/index.php
@@ -122,7 +122,7 @@
  <li><a href="@route('/collections/collection')/@@ collection._id @@"><i class="uk-icon-pencil"></i> @lang('Edit collection')</a></li>
  <li><a ng-click="duplicate(collection._id)"><i class="uk-icon-copy"></i> @lang('Duplicate collection')</a></li>
  <li class="uk-nav-divider"></li>
- <li><a class="uk-text-danger" data-ng-click="remove($index, collection)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete collection')</a></li>
+ <li class="uk-danger"><a data-ng-click="remove($index, collection)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete collection')</a></li>
  @end
  </ul>
  </div>
@@ -162,7 +162,7 @@
  <li><a href="@route('/collections/collection')/@@ collection._id @@"><i class="uk-icon-pencil"></i> @lang('Edit collection')</a></li>
  <li><a ng-click="duplicate(collection._id)"><i class="uk-icon-copy"></i> @lang('Duplicate collection')</a></li>
  <li class="uk-nav-divider"></li>
- <li><a class="uk-text-danger" data-ng-click="remove($index, collection)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete collection')</a></li>
+ <li class="uk-danger"><a data-ng-click="remove($index, collection)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete collection')</a></li>
  @end
  </ul>
  </div>

diff --git a/modules/core/Forms/views/index.php b/modules/core/Forms/views/index.php
@@ -52,7 +52,7 @@
  @hasaccess?("Forms", 'manage.forms')
  <li class="uk-nav-divider"></li>
  <li><a href="@route('/forms/form')/@@ form._id @@"><i class="uk-icon-pencil"></i> @lang('Edit form')</a></li>
- <li><a class="uk-text-danger" data-ng-click="remove($index, form)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete form')</a></li>
+ <li class="uk-danger"><a data-ng-click="remove($index, form)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete form')</a></li>
  @end
  </ul>
  </div>
@@ -88,7 +88,7 @@
  @hasaccess?("Forms", 'manage.forms')
  <li class="uk-nav-divider"></li>
  <li><a href="@route('/forms/form')/@@ form._id @@"><i class="uk-icon-pencil"></i> @lang('Edit form')</a></li>
- <li><a class="uk-text-danger" data-ng-click="remove($index, form)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete form')</a></li>
+ <li class="uk-danger"><a data-ng-click="remove($index, form)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete form')</a></li>
  @end
  </ul>
  </div>

diff --git a/modules/core/Galleries/views/index.php b/modules/core/Galleries/views/index.php
@@ -123,7 +123,7 @@
  <li><a href="@route('/galleries/gallery')/@@ gallery._id @@"><i class="uk-icon-pencil"></i> @lang('Edit gallery')</a></li>
  @hasaccess?("Galleries", 'create.gallery')
  <li class="uk-nav-divider"></li>
- <li><a class="uk-text-danger" data-ng-click="remove($index, gallery)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete gallery')</a></li>
+ <li class="uk-danger"><a data-ng-click="remove($index, gallery)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete gallery')</a></li>
  @end
  </ul>
  </div>

diff --git a/modules/core/Mediamanager/views/index.php b/modules/core/Mediamanager/views/index.php
@@ -166,7 +166,8 @@
  <li class="uk-nav-header uk-text-truncate"><i class="uk-icon-folder-o"></i> @@ folder.name @@</li>
  <li><a ng-click="addBookmark(folder)" title="@lang('Bookmark folder')"><i class="uk-icon-star"></i> @lang('Bookmark folder')</a></li>
  <li><a ng-click="action('rename', folder)" title="@lang('Rename folder')"><i class="uk-icon-text-width"></i> @lang('Rename folder')</a></li>
- <li><a ng-click="action('remove', folder)" title="@lang('Delete folder')"><i class="uk-icon-minus-circle"></i> @lang('Delete folder')</a></li>
+ <li class="uk-nav-divider"></li>
+ <li class="uk-danger"><a ng-click="action('remove', folder)" title="@lang('Delete folder')"><i class="uk-icon-minus-circle"></i> @lang('Delete folder')</a></li>
  </ul>
  </div>
  </div>
@@ -188,7 +189,8 @@
  <li><a ng-click="addBookmark(file)" title="@lang('Bookmark file')"><i class="uk-icon-star"></i> @lang('Bookmark file')</a></li>
  <li><a ng-click="action('rename', file)" title="@lang('Rename file')"><i class="uk-icon-text-width"></i> @lang('Rename file')</a></li>
  <li><a ng-click="action('download', file)" title="@lang('Download file')"><i class="uk-icon-paperclip"></i> @lang('Download file')</a></li>
- <li><a ng-click="action('remove', file)" title="@lang('Delete file')"><i class="uk-icon-minus-circle"></i> @lang('Delete file')</a></li>
+ <li class="uk-nav-divider"></li>
+ <li class="uk-danger"><a ng-click="action('remove', file)" title="@lang('Delete file')"><i class="uk-icon-minus-circle"></i> @lang('Delete file')</a></li>
  </ul>
  </div>
  </div>

diff --git a/modules/core/Regions/views/index.php b/modules/core/Regions/views/index.php
@@ -118,7 +118,7 @@
  @hasaccess?("Regions", 'create.regions')
  <li><li class="uk-nav-divider"></li>
  <li><a data-ng-click="duplicate(region._id)" href="#"><i class="uk-icon-copy"></i> @lang('Duplicate region')</a></li>
- <li><a class="uk-text-danger" data-ng-click="remove($index, region)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete region')</a></li>
+ <li class="uk-danger"><a data-ng-click="remove($index, region)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete region')</a></li>
  @end
  </ul>
  </div>
@@ -152,7 +152,7 @@
  <li><a href="@route('/regions/region')/@@ region._id @@"><i class="uk-icon-pencil"></i> @lang('Edit region')</a></li>
  <li><li class="uk-nav-divider"></li>
  <li><a data-ng-click="duplicate(region._id)" href="#"><i class="uk-icon-copy"></i> @lang('Duplicate region')</a></li>
- <li><a class="uk-text-danger" data-ng-click="remove($index, region)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete region')</a></li>
+ <li class="uk-danger"><a data-ng-click="remove($index, region)" href="#"><i class="uk-icon-minus-circle"></i> @lang('Delete region')</a></li>
  </ul>
  </div>
  </div>

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
  "name": "Cockpit",
- "version": "0.9.17",
+ "version": "0.9.18",
  "check_url": "https://raw.github.com/aheinze/cockpit/master/package.json"
 }