Merge pull request #7 from mirko-pagliai/develop

Develop

API/class-MeCms.Utility.BannerFile.html

@@ -192,7 +192,7 @@ <h1>Class BannerFile</h1>
 		<b>Namespace:</b> <a href="namespace-MeCms.html">MeCms</a>\<a href="namespace-MeCms.Utility.html">Utility</a><br>
 
 
-			<b>Located at</b> <a href="source-class-MeCms.Utility.BannerFile.html#29-100" title="Go to source code">BannerFile.php</a>
+			<b>Located at</b> <a href="source-class-MeCms.Utility.BannerFile.html#29-99" title="Go to source code">BannerFile.php</a>
 		<br>
 	</div>
 
@@ -212,7 +212,7 @@ <h1>Class BannerFile</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_check">#</a>
-		<code><a href="source-class-MeCms.Utility.BannerFile.html#39-45" title="Go to source code">check</a>( )</code>
+		<code><a href="source-class-MeCms.Utility.BannerFile.html#38-44" title="Go to source code">check</a>( )</code>
 
 		<div class="description short">
 			<p>Alias for <code>checkFolder()</code> method</p>
@@ -251,7 +251,7 @@ <h4>Used by</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_checkFolder">#</a>
-		<code><a href="source-class-MeCms.Utility.BannerFile.html#47-54" title="Go to source code">checkFolder</a>( )</code>
+		<code><a href="source-class-MeCms.Utility.BannerFile.html#46-53" title="Go to source code">checkFolder</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the folder is writable</p>
@@ -289,7 +289,7 @@ <h4>Uses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="source-class-MeCms.Utility.BannerFile.html#56-65" title="Go to source code">delete</a>( <span>string <var>$filename</var></span> )</code>
+		<code><a href="source-class-MeCms.Utility.BannerFile.html#55-64" title="Go to source code">delete</a>( <span>string <var>$filename</var></span> )</code>
 
 		<div class="description short">
 			<p>Deletes a file</p>
@@ -336,7 +336,7 @@ <h4>Used by</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_folder">#</a>
-		<code><a href="source-class-MeCms.Utility.BannerFile.html#67-73" title="Go to source code">folder</a>( )</code>
+		<code><a href="source-class-MeCms.Utility.BannerFile.html#66-72" title="Go to source code">folder</a>( )</code>
 
 		<div class="description short">
 			<p>Alias for <code>getFolder()</code> method</p>
@@ -378,7 +378,7 @@ <h4>Used by</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_getFolder">#</a>
-		<code><a href="source-class-MeCms.Utility.BannerFile.html#75-81" title="Go to source code">getFolder</a>( )</code>
+		<code><a href="source-class-MeCms.Utility.BannerFile.html#74-80" title="Go to source code">getFolder</a>( )</code>
 
 		<div class="description short">
 			<p>Gets the main folder path</p>
@@ -412,7 +412,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_getPath">#</a>
-		<code><a href="source-class-MeCms.Utility.BannerFile.html#83-91" title="Go to source code">getPath</a>( <span>string <var>$filename</var></span> )</code>
+		<code><a href="source-class-MeCms.Utility.BannerFile.html#82-90" title="Go to source code">getPath</a>( <span>string <var>$filename</var></span> )</code>
 
 		<div class="description short">
 			<p>Gets the file full path</p>
@@ -455,7 +455,7 @@ <h4>Uses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_path">#</a>
-		<code><a href="source-class-MeCms.Utility.BannerFile.html#93-99" title="Go to source code">path</a>( )</code>
+		<code><a href="source-class-MeCms.Utility.BannerFile.html#92-98" title="Go to source code">path</a>( )</code>
 
 		<div class="description short">
 			<p>Alias for <code>getPath()</code> method</p>

CHANGELOG.md

@@ -7,7 +7,8 @@
 * engine and configuration for widgets have been simplified;
 * the plugin accesses easier configuration;
 * every layout has an optimized copy of Bootstrap;
-* the backend makes greater use of cache.
+* the backend makes greater use of cache;
+* updated Bootstrap to 3.3.5.
 
 # 1.x branch
 ## 1.2 branch

CHANGELOG_it.md

@@ -7,7 +7,8 @@
 * il sistema e la configurazione dei widget sono stati semplificati;
 * il plugin accede più facilmente alla configurazione;
 * ogni layout dispone di una copia ottimizzata di Bootstrap;
-* il backend fa un uso maggiore delle cache.
+* il backend fa un uso maggiore delle cache;
+* aggiornato Bootstrap alla versione 3.3.5.
 
 # 1.x ramo
 ## 1.2 ramo

composer.json

@@ -8,8 +8,8 @@
             "name": "Mirko Pagliai",
             "email": "[email protected]"
     }],
-	"version": "2.0.0-beta",
 	"require": {
+        "cakephp/cakephp": "~3.0",
 		"ext-imagick": "*",
 		"ext-mcrypt": "*",
         "mirko-pagliai/me-tools": "*"
@@ -20,6 +20,6 @@
 		}
 	},
     "scripts": {
-        "post-install-cmd": "MeCms\\Console\\Installer::postInstall"
+        "post-package-install": "MeCms\\Console\\Installer::postInstall"
     }
 }

config/backend/config.json

@@ -82,6 +82,9 @@
     "@btn-danger-bg": "@brand-danger",
     "@btn-danger-border": "darken(@btn-danger-bg, 5%)",
     "@btn-link-disabled-color": "@gray-light",
+    "@btn-border-radius-base": "@border-radius-base",
+    "@btn-border-radius-large": "@border-radius-large",
+    "@btn-border-radius-small": "@border-radius-small",
     "@input-bg": "#fff",
     "@input-bg-disabled": "@gray-lighter",
     "@input-color": "@gray",
@@ -213,6 +216,7 @@
     "@jumbotron-bg": "@gray-lighter",
     "@jumbotron-heading-color": "inherit",
     "@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
+    "@jumbotron-heading-font-size": "ceil((@font-size-base * 4.5))",
     "@state-success-text": "#3c763d",
     "@state-success-bg": "#dff0d8",
     "@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
@@ -405,5 +409,5 @@
     "collapse.js",
     "transition.js"
   ],
-  "customizerUrl": "http://getbootstrap.com/customize/?id=16f0118e802a720f3b6c"
+  "customizerUrl": "http://getbootstrap.com/customize/?id=301490bbc038677d215f"
 }

config/frontend/config.json

@@ -82,6 +82,9 @@
     "@btn-danger-bg": "@brand-danger",
     "@btn-danger-border": "darken(@btn-danger-bg, 5%)",
     "@btn-link-disabled-color": "@gray-light",
+    "@btn-border-radius-base": "@border-radius-base",
+    "@btn-border-radius-large": "@border-radius-large",
+    "@btn-border-radius-small": "@border-radius-small",
     "@input-bg": "#fff",
     "@input-bg-disabled": "@gray-lighter",
     "@input-color": "@gray",
@@ -213,6 +216,7 @@
     "@jumbotron-bg": "@gray-lighter",
     "@jumbotron-heading-color": "inherit",
     "@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
+    "@jumbotron-heading-font-size": "ceil((@font-size-base * 4.5))",
     "@state-success-text": "#3c763d",
     "@state-success-bg": "#dff0d8",
     "@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
@@ -398,5 +402,5 @@
     "collapse.js",
     "transition.js"
   ],
-  "customizerUrl": "http://getbootstrap.com/customize/?id=a2f404da33d026e5f808"
+  "customizerUrl": "http://getbootstrap.com/customize/?id=86222ac7c5107690fc7a"
 }

config/login/config.json

@@ -82,6 +82,9 @@
     "@btn-danger-bg": "@brand-danger",
     "@btn-danger-border": "darken(@btn-danger-bg, 5%)",
     "@btn-link-disabled-color": "@gray-light",
+    "@btn-border-radius-base": "@border-radius-base",
+    "@btn-border-radius-large": "@border-radius-large",
+    "@btn-border-radius-small": "@border-radius-small",
     "@input-bg": "#fff",
     "@input-bg-disabled": "@gray-lighter",
     "@input-color": "@gray",
@@ -213,6 +216,7 @@
     "@jumbotron-bg": "@gray-lighter",
     "@jumbotron-heading-color": "inherit",
     "@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
+    "@jumbotron-heading-font-size": "ceil((@font-size-base * 4.5))",
     "@state-success-text": "#3c763d",
     "@state-success-bg": "#dff0d8",
     "@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
@@ -385,5 +389,5 @@
     "alerts.less"
   ],
   "js": [],
-  "customizerUrl": "http://getbootstrap.com/customize/?id=a4207795d795d2ff69c8"
+  "customizerUrl": "http://getbootstrap.com/customize/?id=ae4c54059bccc1d22c91"
 }

src/Utility/BannerFile.php

@@ -35,7 +35,6 @@
  * </code>
  */
 class BannerFile {
-
     /**
      * Alias for `checkFolder()` method
      * @see checkFolder()
@@ -77,7 +76,7 @@ public static function folder() {
 	 * @return string Folder path
 	 */
 	public static function getFolder() {
-		return WWW_ROOT.'img'.DS.'banners';
+		return WWW_ROOT.'img'.DS.'banners'.DS;
 	}
 
 	/**