Merge branch 'release/4.0.1'

Schlaefer · Jun 8, 2014 · 693f5c5 · 693f5c5
2 parents 006e6ff + bf0c1f8
commit 693f5c5
Show file tree

Hide file tree

Showing 33 changed files with 333 additions and 245 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,4 +1,6 @@
 /*jshint node: true */
+process.env.TZ = 'Europe/Berlin';
+
 module.exports = function(grunt) {
   'use strict';
 
@@ -64,6 +66,7 @@ module.exports = function(grunt) {
   configs.map(function(config) {
     gruntConfig[config] = require('./dev/grunt/config/' + config);
   });
+  gruntConfig.jasmine = require('./dev/grunt/config/jasmine')(gruntConfig.requirejs.release.options);
 
   grunt.initConfig(gruntConfig);
 
@@ -85,11 +88,7 @@ module.exports = function(grunt) {
   ]);
 
   // test
-  grunt.registerTask('test:js', [
-    // jasmine is broken with version 0.6.x
-    // https://github.com/cloudchen/grunt-template-jasmine-requirejs
-    // 'jasmine',
-    'jshint']);
+  grunt.registerTask('test:js', ['jasmine', 'jshint']);
   grunt.registerTask('test:cake', ['shell:testCake']);
   grunt.registerTask('test:phpcs', ['phpcs']); // alias for `grunt phpcs`
   grunt.registerTask('test:php', ['test:cake', 'phpcs']);

diff --git a/app/Config/version.php b/app/Config/version.php
@@ -1,4 +1,4 @@
 <?php
-	Configure::write('Saito.v', '4.0.0');
+	Configure::write('Saito.v', '4.0.1');
 
 	Configure::write('Saito.saitoHomepage', 'http://saito.siezi.com');
diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
@@ -68,7 +68,6 @@ public function login() {
 
 		public function logout() {
 			$this->CurrentUser->logout();
-			$this->redirect('/');
 		}
 
 		public function register() {

diff --git a/app/Lib/UserCategories.php b/app/Lib/UserCategories.php
@@ -39,6 +39,9 @@ protected function _getCustom() {
 			// becomes
 			// [4 => true, 7 => '0', 13 => '13']
 			// with 13 => '13' trueish
+			if (empty($this->_user['user_category_custom'])) {
+				$this->_user['user_category_custom'] = [];
+			}
 			$custom = $this->_user['user_category_custom'] + $this->_categories;
 
 			// then filter for zeros to get only the user categories

diff --git a/app/Locale/deu/LC_MESSAGES/page_titles.po b/app/Locale/deu/LC_MESSAGES/page_titles.po
@@ -39,6 +39,10 @@ msgstr "Kontakt"
 msgid "users/login"
 msgstr "Login"
 
+#
+msgid "users/logout"
+msgstr "Logout"
+
 #
 msgid "users/register"
 msgstr "Registrieren"

diff --git a/app/Locale/eng/LC_MESSAGES/page_titles.po b/app/Locale/eng/LC_MESSAGES/page_titles.po
@@ -39,6 +39,10 @@ msgstr "Contact"
 msgid "users/login"
 msgstr "Login"
 
+#
+msgid "users/logout"
+msgstr "Logout"
+
 #
 msgid "users/register"
 msgstr "Register"

diff --git a/app/Model/User.php b/app/Model/User.php
@@ -484,13 +484,12 @@ public function setCategory($category) {
 				// set custom set
 				$availableCats = $this->Entry->Category->find('list');
 				$categories = array_intersect_key($category, $availableCats);
-				$newCats = array();
 				if (count($categories) === 0) {
 					throw new InvalidArgumentException();
-				} else {
-					foreach ($categories as $cat => $v) {
-						$newCats[$cat] = ($v === true || $v === 1 || $v === '1');
-					}
+				}
+				$newCats = [];
+				foreach ($categories as $cat => $v) {
+					$newCats[$cat] = ($v === true || $v === 1 || $v === '1');
 				}
 				$this->set('user_category_active', 0);
 				$this->set('user_category_custom', $newCats);

diff --git a/app/Test/Case/Controller/UsersControllerTest.php b/app/Test/Case/Controller/UsersControllerTest.php
@@ -154,8 +154,15 @@ public function testLoginUserLocked() {
 		public function testLogout() {
 			$this->generate('Users');
 			$this->_loginUser(3);
-			$this->testAction('/users/logout', ['method' => 'GET']);
-			$this->assertRedirectedTo();
+			$result = $this->testAction('/users/logout',
+				['method' => 'GET', 'return' => 'contents']);
+			$this->assertTag([
+				'tag' => 'meta',
+				'attributes' => [
+					'http-equiv' => 'refresh',
+					'content' => 'regexp:/1;\s/'
+				]
+			], $result);
 		}
 
 		/**

diff --git a/app/View/Elements/entry/category-chooser.ctp b/app/View/Elements/entry/category-chooser.ctp
@@ -1,97 +1,61 @@
 <?php Stopwatch::start('category-chooser.ctp'); ?>
 <div id="category-chooser" style="display: none; overflow: hidden;">
-	<div class="panel">
-		<div class="panel-content panel-form">
-			<?php
-				echo $this->Form->create(
-						null,
-						array(
-								'url' => array(
-										'controller' => 'users',
-										'action'     => 'setcategory'
-								),
-								'style' => 'clear: none;',
-						)
-				);
-			?>
-			<div style="float:right; width: 150px; margin-left: 2em;">
-				<p>
-					<?php echo __('category_chooser_context_exp'); ?>
-				</p>
-			</div>
+  <div class="panel">
+    <div class="panel-content panel-form clearfix">
+      <?php
+        echo $this->Form->create(null, [
+          'url' => [
+            'controller' => 'users',
+            'action' => 'setcategory'
+          ],
+          'style' => 'clear: none;',
+        ]);
+      ?>
+      <div style="float:right; width: 150px; margin-left: 2em;">
+        <p>
+          <?php echo __('category_chooser_context_exp'); ?>
+        </p>
+      </div>
 
-			<ul class="category-chooser-ul">
-				<li class="category-chooser-li">
-					<?php
-						/* For performance reasons we generate the html manually */
-						/*
-						echo $this->Form->checkbox('CatMeta.All',
-								array(
-								'id'		 => 'cb-category-chooser-all',
-								'style'  => 'visibility: hidden;',
-								'value'	 => 1));
-						 */
-					?>
-					<input type="hidden" name="data[CatMeta][All]" id="cb-category-chooser-all_" value="0">
-					<input type="checkbox" name="data[CatMeta][All]" id="cb-category-chooser-all" style="visibility: hidden;" value="1">
-					<?php
-						/* For performance reasons we generate the html manually */
-						/*
-						echo $this->Html->link(__('All'), '/users/setcategory/all')
-						 */
-					?>
-					<a href="<?php echo $this->webroot; ?>users/setcategory/all"><?php echo __('All Categories'); ?></a>
+      <ul class="category-chooser-ul">
+        <li class="category-chooser-li">
+          <?php
+            /* For performance reasons we generate the html manually */
+            /*
+            echo $this->Html->link(__('All'), '/users/setcategory/all')
+             */
+          ?>
+          <a
+            href="<?php echo $this->webroot; ?>users/setcategory/all"><?php echo __('All Categories'); ?></a>
 
-				</li>
-				<?php foreach ($categoryChooser as $key => $title): ?>
-					<li class="category-chooser-li">
-						<?php
-							/* For performance reasons we generate the html manually */
-							/*
-						echo $this->Form->checkbox('CatChooser.' . $key,
-								array(
-								'onclick'			 => "$('#cb-category-chooser-all').removeAttr('checked')",
-								'checked'			 => isset($categoryChooserChecked[$key]),
-								'value'				 => 1));
-							 *
-							 */
-						?>
-						<input type="hidden" name="data[CatChooser][<?php echo $key; ?>]" id="CatChooser<?php echo $key; ?>_" value="0">
-						<input type="checkbox" name="data[CatChooser][<?php echo $key; ?>]"
-								<?php echo (isset($categoryChooserChecked[$key])) ? 'checked="checked"' : '' ; ?>
-									 onclick="$('#cb-category-chooser-all').removeAttr('checked')" value="1" id="CatChooser<?php echo $key; ?>">
-						<?php
-							/* For performance reasons we generate the html manually */
-							/*
-							echo $this->Html->link($title, '/users/setcategory/' . $key)
-							 *
-							 */
-						?>
-						<a href="<?php echo $this->webroot; ?>users/setcategory/<?php echo $key; ?>"><?php echo $title; ?></a>
+        </li>
+        <?php foreach ($categoryChooser as $key => $title): ?>
+          <li class="category-chooser-li">
+            <?php
+            echo $this->Form->checkbox('CatChooser.' . $key,
+                array(
+                'onclick'			 => "$('#cb-category-chooser-all').removeAttr('checked')",
+                'checked'			 => isset($categoryChooserChecked[$key]),
+                'value'				 => 1));
+            ?>
+            <?php
+              /* For performance reasons we generate the html manually */
+              /*
+              echo $this->Html->link($title, '/users/setcategory/' . $key)
+               *
+               */
+            ?>
+            <a
+              href="<?php echo $this->webroot; ?>users/setcategory/<?php echo $key; ?>"><?php echo $title; ?></a>
 
-					</li>
-				<?php endforeach; ?>
-			</ul>
-			<?php
-				/*
-					$this->Js->get('#cb-category-chooser-all')->event('click',
-							<<<EOF
-					if (this.checked) {
-						$('#category-chooser').find(':checkbox').attr('checked', 'checked');
-					} else {
-						$('#category-chooser').find(':checkbox').removeAttr('checked');
-					}
-					return true;
-		EOF
-					);
-				*/
-			?>
-			<?php echo
-			$this->Form->submit(__('Apply'), array(
-					'class' => 'btn btn-submit'))
-			?>
-			<?php echo $this->Form->end() ?>
-		</div>
-	</div>
+          </li>
+        <?php endforeach; ?>
+      </ul>
+      <?php
+        echo $this->Form->submit(__('Apply'), ['class' => 'btn btn-submit']);
+        echo $this->Form->end();
+      ?>
+    </div>
+  </div>
 </div>
 <?php Stopwatch::end('category-chooser.ctp'); ?>
diff --git a/app/View/Themed/Paz/webroot/css/src/partials/_categoryChooser.scss b/app/View/Themed/Paz/webroot/css/src/partials/_categoryChooser.scss
@@ -0,0 +1,7 @@
+.category-chooser-ul {
+  margin-bottom: 1em;
+}
+
+.category-chooser-li {
+  margin: 0.5em;
+}
diff --git a/app/View/Themed/Paz/webroot/css/src/partials/_forms.scss b/app/View/Themed/Paz/webroot/css/src/partials/_forms.scss
@@ -92,4 +92,3 @@ textarea, input[type=text], input[type=password], %textinput {
   }
 }
 
-
diff --git a/app/View/Themed/Paz/webroot/css/src/theme.scss b/app/View/Themed/Paz/webroot/css/src/theme.scss
@@ -6,6 +6,7 @@
 @import "partials/_imports.scss";
 @import "partials/_modules.scss";
 
+@import "partials/_categoryChooser";
 @import "partials/_forms";
 @import "partials/_layout";
 @import "partials/_slidetabs";

diff --git a/app/View/Themed/Paz/webroot/css/stylesheets/night.css b/app/View/Themed/Paz/webroot/css/stylesheets/night.css
@@ -158,6 +158,10 @@ body.headerClosed #hero-home-link { padding-top: 0.5em; padding-bottom: 0.5em; }
 .shp-show-btn { display: none; }
 .shp-show-btn.is-active { display: inline-block; }
 
+.category-chooser-ul { margin-bottom: 1em; }
+
+.category-chooser-li { margin: 0.5em; }
+
 .input { margin: 0 0 1em; }
 
 textarea, input[type=text], input[type=password], .markItUp textarea { outline-style: none; border-style: none; width: 100%; background: #303035; border-left: 2px solid #ffcc00; -webkit-appearance: none; border-radius: 0; }

diff --git a/app/View/Themed/Paz/webroot/css/stylesheets/theme.css b/app/View/Themed/Paz/webroot/css/stylesheets/theme.css
@@ -158,6 +158,10 @@ body.headerClosed #hero-home-link { padding-top: 0.5em; padding-bottom: 0.5em; }
 .shp-show-btn { display: none; }
 .shp-show-btn.is-active { display: inline-block; }
 
+.category-chooser-ul { margin-bottom: 1em; }
+
+.category-chooser-li { margin: 0.5em; }
+
 .input { margin: 0 0 1em; }
 
 textarea, input[type=text], input[type=password], .markItUp textarea { outline-style: none; border-style: none; width: 100%; background: #fbfbfb; border-left: 2px solid #a5a5a5; -webkit-appearance: none; border-radius: 0; }

diff --git a/app/View/Tools/test_js.ctp b/app/View/Tools/test_js.ctp
@@ -16,9 +16,6 @@
 						'../dev/bower_components/jasmine/lib/jasmine-core/jasmine',
 						'../dev/bower_components/jasmine/lib/jasmine-core/jasmine-html',
 						'tests/boot.js',
-						// jasmin extensions
-						'../dev/bower_components/jasmine-jquery/jasmine-jquery.js',
-						'../dev/bower_components/sinonjs/sinon.js',
 
 						//
 						'lib/jquery-ui/jquery-ui.custom.min.js',

diff --git a/app/View/Users/logout.ctp b/app/View/Users/logout.ctp
@@ -0,0 +1,9 @@
+<?php
+  // trigger for logout in JS frontend
+  echo $this->Html->tag('div', '', ['class' => 'users logout']);
+
+  $redirect = $this->Html->meta([
+    'http-equiv' => 'refresh',
+    'content' => '1; ' . $this->webroot
+  ]);
+  $this->append('meta', $redirect);
diff --git a/app/webroot/css/src/partials/_basic.scss b/app/webroot/css/src/partials/_basic.scss
@@ -0,0 +1,10 @@
+.clearfix {
+  &:before,
+  &:after {
+    content: " ";
+    display: table;
+  }
+  &:after {
+    clear: both;
+  }
+}
diff --git a/app/webroot/css/src/static.scss b/app/webroot/css/src/static.scss
@@ -7,6 +7,7 @@ $fa-font-path: "../stylesheets/font";
 
 @import "partials/lib/_pnotify";
 
+@import "partials/_basic";
 @import "partials/_font-awesome-extend";
 @import "partials/_jquery-ui";
 @import "partials/_messages";

diff --git a/app/webroot/css/stylesheets/static.css b/app/webroot/css/stylesheets/static.css
diff --git a/app/webroot/dist/common.min.js b/app/webroot/dist/common.min.js
diff --git a/app/webroot/dist/main.min.js b/app/webroot/dist/main.min.js
diff --git a/app/webroot/js/collections/threads.js b/app/webroot/js/collections/threads.js
@@ -1,21 +1,20 @@
 define([
   'underscore',
   'backbone',
-  'backboneLocalStorage',
   'models/thread',
   'models/app',
+  'backboneLocalStorage',
   'lib/saito/localStorageHelper'
-], function(_, Backbone, Store, ThreadModel, App) {
+], function(_, Backbone, ThreadModel, App) {
   'use strict';
 
   var ThreadCollection = Backbone.Collection.extend({
 
     model: ThreadModel,
 
     localStorage: (function() {
-      if (App.reqres.request('app:localStorage:available')) {
-        return new Store('Threads');
-      }
+      var key = App.reqres.request('app:localStorage:key', 'Threads');
+      return new Backbone.LocalStorage(key);
     })(),
 
     fetch: function(options) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -92,4 +92,3 @@ textarea, input[type=text], input[type=password], %textinput {
		}
		}