Merge branch 'refs/heads/release/0.8.1'

timble · May 13, 2014 · 4f314c2 · 4f314c2
2 parents 8bd5a3a + d160da6
commit 4f314c2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 252 deletions.
diff --git a/application/admin/component/application/dispatcher/http.php b/application/admin/component/application/dispatcher/http.php
@@ -303,7 +303,7 @@ public function loadLanguage(Library\CommandContext $context)
  $languages->setActive($language);
 
  // TODO: Remove this.
- JFactory::getConfig()->setValue('config.language', $language->iso_code);
+ //JFactory::getConfig()->setValue('config.language', $language->iso_code);
  }
 
  /**

diff --git a/application/admin/component/categories/view/categories/templates/list.html.php b/application/admin/component/categories/view/categories/templates/list.html.php
@@ -11,7 +11,7 @@
 <ul class="navigation">
  <li>
  <a class="<?= $state->category == null ? 'active' : ''; ?>" href="<?= route('category=' ) ?>">
- <?= 'All categories' ?>
+ <?= translate('All categories') ?>
  </a>
  </li>
  <? foreach ($categories as $category) : ?>

diff --git a/component/ckeditor/resources/assets/js/ckeditor.koowa.js b/component/ckeditor/resources/assets/js/ckeditor.koowa.js
@@ -0,0 +1,30 @@
+if(!Koowa) var Koowa = {};
+
+Koowa.Controller.Form = new Class({
+
+ Extends: Koowa.Controller,
+
+ _action_default: function(action, data, novalidate){
+ if(!novalidate && !this.fireEvent('validate')) {
+ return false;
+ }
+
+ // Don't validate if novalidate is set
+ if(!novalidate){
+ // Loop through all the editor intances
+ // See: https://ckeditor.com/forums/CKEditor-3.x/Getting-CKEDITOR-instance
+ for(var i in CKEDITOR.instances) {
+
+ element = document.getElementById(CKEDITOR.instances[i].name);
+
+ // If any instance is empty then abort the save action
+ if(!CKEDITOR.instances[i].getData() && element.classList.contains('ckeditor-required')) {
+ return false;
+ }
+ }
+ }
+
+ this.form.adopt(new Element('input', {name: '_action', type: 'hidden', value: action}));
+ this.form.submit();
+ }
+});
diff --git a/component/ckeditor/view/editor/templates/default.html.php b/component/ckeditor/view/editor/templates/default.html.php
@@ -9,6 +9,7 @@
 ?>
 
 <script src="assets:https://ckeditor/ckeditor/ckeditor.js" />
+<script src="assets:https://ckeditor/js/ckeditor.koowa.js" />
 
 <script>
  jQuery(document).ready(function() {
@@ -26,4 +27,4 @@
  });
 </script>
 
-<textarea id="<?= $id ?>" name="<?= $name ?>" class="ckeditor editable-<?= $id ?> validate-editor" style="visibility:hidden"><?= $text ?></textarea>
+<textarea id="<?= $id ?>" name="<?= $name ?>" class="ckeditor editable-<?= $id ?> validate-editor <?= $class ?>" style="visibility:hidden"><?= $text ?></textarea>
diff --git a/install/vagrant/puppet/manifests/default.pp b/install/vagrant/puppet/manifests/default.pp