Added files, and especiall upload files facility.

Main contribution from Fabian Murer, as part of ETH student project.
Supervised, refactorized and merged by Jocelyn Fiat.

Signed-off-by: Fabian Murer <fmurer@student.ethz.ch>
Signed-off-by: Jocelyn Fiat <git@djoce.net>

examples/demo/install_modules.bat

@@ -1,4 +1,3 @@
-@echo off
 setlocal
 set ROC_CMD=call %~dp0..\..\tools\roc.bat
 set ROC_CMS_DIR=%~dp0

examples/demo/site/config/blocks.ini

@@ -2,8 +2,8 @@
 
 #navigation.region=sidebar_first
 #navigation.condition=is_front
-#management.conditions[]=path:admin*
+management.conditions[]=path:admin*
-#management.conditions[]=is_front
+management.conditions[]=is_front
 
 #Feeds
 feed.news.weight=3

examples/demo/site/modules/auth/config/auth.json

@@ -1,10 +1,5 @@
 {
 	"subject": "Thank you for contacting us",
-	"forms": {
-		"registration": {
-			"application_description": "Present yourself in a few lines, otherwise your application is likely to be rejected."
-		}
-	},
 	"recaptcha": {
 		"site_key":"6Lex9RMTAAAAAKleC4x6TaRlFcpLbEWgH_U7MSiD",
 		"secret_key":"6Lex9RMTAAAAAAkBczvX5DUiyg_xoM_EthVVgRRx"

examples/demo/site/modules/auth/templates/block_register.tpl

@@ -1,4 +1,4 @@
-<div>
+ <div>
     <form action="{$site_url/}account/roc-register" method="post">
         <fieldset>
             <legend>Registration</legend>
@@ -17,21 +17,22 @@
                 <input type="email" id="email" name="email"  value="{$email/}"  required/>
                 <label for="email">Email</label>
                 {if isset="$error_email"}
-				<span><i>{$error_email/}</i></span> <br/>
+                    <span><i>{$error_email/}</i></span> <br>
                 {/if}
             </div>
             <div>
-				<textarea rows="4" cols="50" name="personal_information" id="personal_information" required>{$personal_information/}</textarea>
+               <textarea rows="4" cols="50" name="personal_information" id="personal_information" required>
+			   				{$personal_information/}
+			   </textarea>
 			   <label for="personal_information">Tell us why you want to register an account</label>
                 {if isset="$error_application"}
-				<span><i>{$error_application/}</i></span><br/>
+                    <span><i>{$error_application/}</i></span> <br>
-				{/if}
-				{if isset="$application_description"}
-				<br/>
-				<p class="description">{$application_description/}</p>
                 {/if}
             </div>
-			{unless isempty="$recaptcha_site_key"}<div class="g-recaptcha" data-sitekey="{$recaptcha_site_key/}"></div><br/>{/unless}
+            {unless isempty="$recaptcha_site_key"}
+        		<div class="g-recaptcha" data-sitekey="{$recaptcha_site_key/}"></div>
+        	<br/>
+			{/unless}
             <button type="submit">Register</button>
         </fieldset>    
     </form>

examples/demo/site/modules/basic_auth/templates/block_login.tpl

@@ -1,6 +1,6 @@
 {unless isset="$user"}
  	<div class="login-box">
-		<div class="description">The "Basic Auth" relies on the HTTP basic access authentication.<br/>(see also: <a href="https://en.wikipedia.org/wiki/Basic_access_authentication">https://en.wikipedia.org/wiki/Basic_access_authentication</a> )</div>
+		<div class="description">The "Basic Auth" relies on the HTTP basic acces authentication.<br/>(see also: <a href="https://en.wikipedia.org/wiki/Basic_access_authentication">https://en.wikipedia.org/wiki/Basic_access_authentication</a> )</div>
 		<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
 		<div>
 			<form name="cms_basic_auth" action="{$site_url/}roc-basic-login" method="POST">

examples/demo/site/modules/files/files/css/files.css

@@ -1,44 +1,38 @@
-.uploaded-files table {
+.uploaded-files {
   width: 100%;
   border-collapse: collapse;
   border: 1px solid black;
 }
-.uploaded-files table th {
+.uploaded-files th {
-  padding: 3px 0 3px 5px;
+  padding-left: 5px;
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
-.uploaded-files table td {
+.uploaded-files td {
-  padding: 3px 0 3px 5px;
+  padding-left: 5px;
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
 .uploaded-files a.button {
   color: black;
   text-decoration: none;
   border: solid 1px #999;
   background-color: #ddd;
-  padding: 2px 4px 2px 4px;
 }
 .uploaded-files a.button:hover {
   color: black;
-  border: solid 1px #06f;
+  text-decoration: none;
-  background-color: #cff;
 }
 
-.upload-files .center {
+.upload-files a.upload-button {
-  text-align: center;
-  padding: 10px;
-}
-.upload-files a.button {
   margin: auto;
   width: 100px;
   color: black;
   text-decoration: none;
-  border: solid 1px #999;
-  background-color: #ddd;
-  padding: 2px 4px 2px 4px;
 }
-.upload-files a.button:hover {
+.upload-files a.upload-button:hover {
   color: black;
-  border: solid 1px #06f;
+  text-decoration: none;
-  background-color: #cff;
 }
 
 /******************* Drop Zone *******************/
@@ -50,3 +44,18 @@
   padding-top: 15px;
   padding-bottom: 15px;
 }
+.dropzone .dz-message {
+  cursor: pointer;
+}
+.dropzone .dz-preview, .dropzone .dz-file-preview, .dropzone .dz-processing, .dropzone .dz-success,
+.dropzone .dz-image-preview, .dropzone .dz-complete {
+  padding: 10px;
+  margin: 10px;
+  width: auto;
+  display: inline-block;
+}
+.dropzone .dz-preview {
+  border: 1px solid black;
+  border-radius: 5px;
+  background: #e6e6e6;
+}

examples/demo/site/modules/files/files/js/dropzone.js

@@ -24,14 +24,16 @@
  * THE SOFTWARE.
  *
  */
-var Dropzone, Emitter, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
+
+(function() {
+  var Dropzone, Emitter, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
     __slice = [].slice,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-noop = function() {};
+  noop = function() {};
 
-Emitter = (function() {
+  Emitter = (function() {
     function Emitter() {}
 
     Emitter.prototype.addEventListener = Emitter.prototype.on;
@@ -91,9 +93,9 @@ Emitter = (function() {
 
     return Emitter;
 
-})();
+  })();
 
-Dropzone = (function(_super) {
+  Dropzone = (function(_super) {
     var extend, resolveOption;
 
     __extends(Dropzone, _super);
@@ -136,7 +138,6 @@ Dropzone = (function(_super) {
       previewsContainer: null,
       hiddenInputContainer: "body",
       capture: null,
-    renameFilename: null,
       dictDefaultMessage: "Drop files here to upload",
       dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.",
       dictFallbackText: "Please use the fallback form below to upload your files like in the olden days.",
@@ -258,7 +259,7 @@ Dropzone = (function(_super) {
           _ref = file.previewElement.querySelectorAll("[data-dz-name]");
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
             node = _ref[_i];
-          node.textContent = this._renameFilename(file.name);
+            node.textContent = file.name;
           }
           _ref1 = file.previewElement.querySelectorAll("[data-dz-size]");
           for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
@@ -719,13 +720,6 @@ Dropzone = (function(_super) {
       }
     };
 
-  Dropzone.prototype._renameFilename = function(name) {
-    if (typeof this.options.renameFilename !== "function") {
-      return name;
-    }
-    return this.options.renameFilename(name);
-  };
-
     Dropzone.prototype.getFallbackForm = function() {
       var existingFallback, fields, fieldsString, form;
       if (existingFallback = this.getExistingFallback()) {
@@ -927,16 +921,11 @@ Dropzone = (function(_super) {
     };
 
     Dropzone.prototype._addFilesFromDirectory = function(directory, path) {
-    var dirReader, errorHandler, readEntries;
+      var dirReader, entriesReader;
       dirReader = directory.createReader();
-    errorHandler = function(error) {
+      entriesReader = (function(_this) {
-      return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
+        return function(entries) {
-    };
-    readEntries = (function(_this) {
-      return function() {
-        return dirReader.readEntries(function(entries) {
           var entry, _i, _len;
-          if (entries.length > 0) {
           for (_i = 0, _len = entries.length; _i < _len; _i++) {
             entry = entries[_i];
             if (entry.isFile) {
@@ -951,13 +940,11 @@ Dropzone = (function(_super) {
               _this._addFilesFromDirectory(entry, "" + path + "/" + entry.name);
             }
           }
-            readEntries();
-          }
-          return null;
-        }, errorHandler);
         };
       })(this);
-    return readEntries();
+      return dirReader.readEntries(entriesReader, function(error) {
+        return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
+      });
     };
 
     Dropzone.prototype.accept = function(file, done) {
@@ -1375,7 +1362,7 @@ Dropzone = (function(_super) {
         }
       }
       for (i = _m = 0, _ref5 = files.length - 1; 0 <= _ref5 ? _m <= _ref5 : _m >= _ref5; i = 0 <= _ref5 ? ++_m : --_m) {
-      formData.append(this._getParamName(i), files[i], this._renameFilename(files[i].name));
+        formData.append(this._getParamName(i), files[i], files[i].name);
       }
       return this.submitRequest(xhr, formData, files);
     };
@@ -1420,23 +1407,23 @@ Dropzone = (function(_super) {
 
     return Dropzone;
 
-})(Emitter);
+  })(Emitter);
 
-Dropzone.version = "4.3.0";
+  Dropzone.version = "4.2.0";
 
-Dropzone.options = {};
+  Dropzone.options = {};
 
-Dropzone.optionsForElement = function(element) {
+  Dropzone.optionsForElement = function(element) {
     if (element.getAttribute("id")) {
       return Dropzone.options[camelize(element.getAttribute("id"))];
     } else {
       return void 0;
     }
-};
+  };
 
-Dropzone.instances = [];
+  Dropzone.instances = [];
 
-Dropzone.forElement = function(element) {
+  Dropzone.forElement = function(element) {
     if (typeof element === "string") {
       element = document.querySelector(element);
     }
@@ -1444,11 +1431,11 @@ Dropzone.forElement = function(element) {
       throw new Error("No Dropzone found for given element. This is probably because you're trying to access it before Dropzone had the time to initialize. Use the `init` option to setup any additional observers on your Dropzone.");
     }
     return element.dropzone;
-};
+  };
 
-Dropzone.autoDiscover = true;
+  Dropzone.autoDiscover = true;
 
-Dropzone.discover = function() {
+  Dropzone.discover = function() {
     var checkElements, dropzone, dropzones, _i, _len, _results;
     if (document.querySelectorAll) {
       dropzones = document.querySelectorAll(".dropzone");
@@ -1480,11 +1467,11 @@ Dropzone.discover = function() {
       }
     }
     return _results;
-};
+  };
 
-Dropzone.blacklistedBrowsers = [/opera.*Macintosh.*version\/12/i];
+  Dropzone.blacklistedBrowsers = [/opera.*Macintosh.*version\/12/i];
 
-Dropzone.isBrowserSupported = function() {
+  Dropzone.isBrowserSupported = function() {
     var capableBrowser, regex, _i, _len, _ref;
     capableBrowser = true;
     if (window.File && window.FileReader && window.FileList && window.Blob && window.FormData && document.querySelector) {
@@ -1504,9 +1491,9 @@ Dropzone.isBrowserSupported = function() {
       capableBrowser = false;
     }
     return capableBrowser;
-};
+  };
 
-without = function(list, rejectedItem) {
+  without = function(list, rejectedItem) {
     var item, _i, _len, _results;
     _results = [];
     for (_i = 0, _len = list.length; _i < _len; _i++) {
@@ -1516,22 +1503,22 @@ without = function(list, rejectedItem) {
       }
     }
     return _results;
-};
+  };
 
-camelize = function(str) {
+  camelize = function(str) {
     return str.replace(/[\-_](\w)/g, function(match) {
       return match.charAt(1).toUpperCase();
     });
-};
+  };
 
-Dropzone.createElement = function(string) {
+  Dropzone.createElement = function(string) {
     var div;
     div = document.createElement("div");
     div.innerHTML = string;
     return div.childNodes[0];
-};
+  };
 
-Dropzone.elementInside = function(element, container) {
+  Dropzone.elementInside = function(element, container) {
     if (element === container) {
       return true;
     }
@@ -1541,9 +1528,9 @@ Dropzone.elementInside = function(element, container) {
       }
     }
     return false;
-};
+  };
 
-Dropzone.getElement = function(el, name) {
+  Dropzone.getElement = function(el, name) {
     var element;
     if (typeof el === "string") {
       element = document.querySelector(el);
@@ -1554,9 +1541,9 @@ Dropzone.getElement = function(el, name) {
       throw new Error("Invalid `" + name + "` option provided. Please provide a CSS selector or a plain HTML element.");
     }
     return element;
-};
+  };
 
-Dropzone.getElements = function(els, name) {
+  Dropzone.getElements = function(els, name) {
     var e, el, elements, _i, _j, _len, _len1, _ref;
     if (els instanceof Array) {
       elements = [];
@@ -1583,17 +1570,17 @@ Dropzone.getElements = function(els, name) {
       throw new Error("Invalid `" + name + "` option provided. Please provide a CSS selector, a plain HTML element or a list of those.");
     }
     return elements;
-};
+  };
 
-Dropzone.confirm = function(question, accepted, rejected) {
+  Dropzone.confirm = function(question, accepted, rejected) {
     if (window.confirm(question)) {
       return accepted();
     } else if (rejected != null) {
       return rejected();
     }
-};
+  };
 
-Dropzone.isValidFile = function(file, acceptedFiles) {
+  Dropzone.isValidFile = function(file, acceptedFiles) {
     var baseMimeType, mimeType, validType, _i, _len;
     if (!acceptedFiles) {
       return true;
@@ -1619,47 +1606,47 @@ Dropzone.isValidFile = function(file, acceptedFiles) {
       }
     }
     return false;
-};
+  };
 
-if (typeof jQuery !== "undefined" && jQuery !== null) {
+  if (typeof jQuery !== "undefined" && jQuery !== null) {
     jQuery.fn.dropzone = function(options) {
       return this.each(function() {
         return new Dropzone(this, options);
       });
     };
-}
+  }
 
-if (typeof module !== "undefined" && module !== null) {
+  if (typeof module !== "undefined" && module !== null) {
     module.exports = Dropzone;
-} else {
+  } else {
     window.Dropzone = Dropzone;
-}
+  }
 
-Dropzone.ADDED = "added";
+  Dropzone.ADDED = "added";
 
-Dropzone.QUEUED = "queued";
+  Dropzone.QUEUED = "queued";
 
-Dropzone.ACCEPTED = Dropzone.QUEUED;
+  Dropzone.ACCEPTED = Dropzone.QUEUED;
 
-Dropzone.UPLOADING = "uploading";
+  Dropzone.UPLOADING = "uploading";
 
-Dropzone.PROCESSING = Dropzone.UPLOADING;
+  Dropzone.PROCESSING = Dropzone.UPLOADING;
 
-Dropzone.CANCELED = "canceled";
+  Dropzone.CANCELED = "canceled";
 
-Dropzone.ERROR = "error";
+  Dropzone.ERROR = "error";
 
-Dropzone.SUCCESS = "success";
+  Dropzone.SUCCESS = "success";
 
 
-/*
+  /*
   
-Bugfix for iOS 6 and 7
+  Bugfix for iOS 6 and 7
-Source: http://stackoverflow.com/questions/11929099/html5-canvas-drawimage-ratio-bug-ios
+  Source: http://stackoverflow.com/questions/11929099/html5-canvas-drawimage-ratio-bug-ios
-based on the work of https://github.com/stomita/ios-imagefile-megapixel
+  based on the work of https://github.com/stomita/ios-imagefile-megapixel
    */
 
-detectVerticalSquash = function(img) {
+  detectVerticalSquash = function(img) {
     var alpha, canvas, ctx, data, ey, ih, iw, py, ratio, sy;
     iw = img.naturalWidth;
     ih = img.naturalHeight;
@@ -1687,16 +1674,16 @@ detectVerticalSquash = function(img) {
     } else {
       return ratio;
     }
-};
+  };
 
-drawImageIOSFix = function(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh) {
+  drawImageIOSFix = function(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh) {
     var vertSquashRatio;
     vertSquashRatio = detectVerticalSquash(img);
     return ctx.drawImage(img, sx, sy, sw, sh, dx, dy, dw, dh / vertSquashRatio);
-};
+  };
 
 
-/*
+  /*
    * contentloaded.js
    *
    * Author: Diego Perini (diego.perini at gmail.com)
@@ -1710,7 +1697,7 @@ drawImageIOSFix = function(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh) {
    * http://javascript.nwbox.com/ContentLoaded/MIT-LICENSE
    */
 
-contentLoaded = function(win, fn) {
+  contentLoaded = function(win, fn) {
     var add, doc, done, init, poll, pre, rem, root, top;
     done = false;
     top = true;
@@ -1752,12 +1739,14 @@ contentLoaded = function(win, fn) {
       doc[add](pre + "readystatechange", init, false);
       return win[add](pre + "load", init, false);
     }
-};
+  };
 
-Dropzone._autoDiscoverFunction = function() {
+  Dropzone._autoDiscoverFunction = function() {
     if (Dropzone.autoDiscover) {
       return Dropzone.discover();
     }
-};
+  };
 
-contentLoaded(window, Dropzone._autoDiscoverFunction);
+  contentLoaded(window, Dropzone._autoDiscoverFunction);
+
+}).call(this);

examples/demo/site/modules/files/files/js/src/basic.scss

@@ -1,78 +0,0 @@
-/*
- * The MIT License
- * Copyright (c) 2012 Matias Meno <m@tias.me>
- */
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-.dropzone, .dropzone * {
-  box-sizing: border-box;
-}
-.dropzone {
-
-  position: relative;
-
-  .dz-preview {
-    position: relative;
-    display: inline-block;
-    width: 120px;
-    margin: 0.5em;
-
-    .dz-progress {
-      display: block;
-      height: 15px;
-      border: 1px solid #aaa;
-      .dz-upload {
-        display: block;
-        height: 100%;
-        width: 0;
-        background: green;
-      }
-    }
-
-    .dz-error-message {
-      color: red;
-      display: none;
-    }
-    &.dz-error {
-      .dz-error-message, .dz-error-mark {
-        display: block;
-      }
-    }
-    &.dz-success {
-      .dz-success-mark {
-        display: block;
-      }
-    }
-
-    .dz-error-mark, .dz-success-mark {
-      position: absolute;
-      display: none;
-      left: 30px;
-      top: 30px;
-      width: 54px;
-      height: 58px;
-      left: 50%;
-      margin-left: -(54px/2);
-    }
-
-
-  }
-
-}

examples/demo/site/modules/files/files/js/src/dropzone.scss

@@ -1,413 +0,0 @@
-/*
- * The MIT License
- * Copyright (c) 2012 Matias Meno <m@tias.me>
- */
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-@mixin keyframes($name) {
-  @-webkit-keyframes #{$name} {
-    @content; 
-  }
-  @-moz-keyframes #{$name} {
-    @content;
-  }
-  @keyframes #{$name} {
-    @content;
-  } 
-}
-
-
-@mixin prefix($map, $vendors: webkit moz ms o) {
-  @each $prop, $value in $map {
-    @if $vendors {
-      @each $vendor in $vendors {
-        #{"-" + $vendor + "-" + $prop}: #{$value};
-      }
-    }
-    // Dump regular property anyway
-    #{$prop}: #{$value};
-  }
-}
-
-
-@include keyframes(passing-through) {
-  
-  0% {
-    opacity: 0;
-    @include prefix((transform: translateY(40px)));
-  }
-
-  30%, 70% {
-    opacity: 1;
-    @include prefix((transform: translateY(0px)));
-  }
-
-  100% {
-    opacity: 0;
-    @include prefix((transform: translateY(-40px)));
-  }
-}
-
-
-@include keyframes(slide-in) {
-  
-  0% {
-    opacity: 0;
-    @include prefix((transform: translateY(40px)));
-  }
-
-  30% {
-    opacity: 1;
-    @include prefix((transform: translateY(0px)));
-  }
-}
-
-
-
-@include keyframes(pulse) {
-  
-  0% { @include prefix((transform: scale(1))); }
-  10% { @include prefix((transform: scale(1.1))); }
-  20% { @include prefix((transform: scale(1))); }
-
-}
-
-
-
-.dropzone, .dropzone * {
-  box-sizing: border-box;
-}
-.dropzone {
-
-  $image-size: 120px;
-
-  $image-border-radius: 20px;
-
-  &.dz-clickable {
-    cursor: pointer;
-
-    * {
-      cursor: default;
-    }
-    .dz-message {
-      &, * {
-        cursor: pointer;
-      }
-    }
-  }
-
-  min-height: 150px;
-  border: 2px solid rgba(0, 0, 0, 0.3);
-  background: white;
-  padding: 20px 20px;
-
-  &.dz-started {
-    .dz-message {
-      display: none;
-    }
-  }
-
-  &.dz-drag-hover {
-    border-style: solid;
-    .dz-message {
-      opacity: 0.5;
-    }
-  }
-  .dz-message {
-    text-align: center;
-    margin: 2em 0;
-
-
-  }
-
-
-
-  .dz-preview {
-    position: relative;
-    display: inline-block;
-
-    vertical-align: top;
-
-    margin: 16px;
-    min-height: 100px;
-
-    &:hover {
-      // Making sure that always the hovered preview element is on top
-      z-index: 1000;
-      .dz-details {
-        opacity: 1;
-      }
-    }
-
-    &.dz-file-preview {
-
-      .dz-image {
-        border-radius: $image-border-radius;
-        background: #999;
-        background: linear-gradient(to bottom, #eee, #ddd);
-      }
-
-      .dz-details {
-        opacity: 1;
-      }
-    }
-
-    &.dz-image-preview {
-      background: white;
-      .dz-details {
-        @include prefix((transition: opacity 0.2s linear));
-      }
-    }
-
-    .dz-remove {
-      font-size: 14px;
-      text-align: center;
-      display: block;
-      cursor: pointer;
-      border: none;
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-
-    &:hover .dz-details {
-      opacity: 1;
-    }
-    .dz-details {
-      $background-color: #444;
-
-      z-index: 20;
-
-      position: absolute;
-      top: 0;
-      left: 0;
-
-      opacity: 0;
-
-      font-size: 13px;
-      min-width: 100%;
-      max-width: 100%;
-      padding: 2em 1em;
-      text-align: center;
-      color: rgba(0, 0, 0, 0.9);
-
-      $width: 120px;
-
-      line-height: 150%;
-
-      .dz-size {
-        margin-bottom: 1em;
-        font-size: 16px;
-      }
-
-      .dz-filename {
-
-        white-space: nowrap;
-
-        &:hover {
-          span {
-            border: 1px solid rgba(200, 200, 200, 0.8);
-            background-color: rgba(255, 255, 255, 0.8);
-          }
-        }
-        &:not(:hover) {
-          span {
-            border: 1px solid transparent;
-          }
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-      }
-
-      .dz-filename, .dz-size {
-        span {
-          background-color: rgba(255, 255, 255, 0.4);
-          padding: 0 0.4em;
-          border-radius: 3px;
-        }
-      }
-
-    }
-
-    &:hover {
-      .dz-image {
-        // opacity: 0.8;
-        img {
-          @include prefix((transform: scale(1.05, 1.05))); // Getting rid of that white bleed-in
-          @include prefix((filter: blur(8px)), webkit); // Getting rid of that white bleed-in
-        }
-      }
-    }
-    .dz-image {
-      border-radius: $image-border-radius;
-      overflow: hidden;
-      width: $image-size;
-      height: $image-size;
-      position: relative;
-      display: block;
-      z-index: 10;
-
-      img {
-        display: block;
-      }
-    }
-
-
-    &.dz-success {
-      .dz-success-mark {
-        @include prefix((animation: passing-through 3s cubic-bezier(0.770, 0.000, 0.175, 1.000)));
-      }
-    }
-    &.dz-error {
-      .dz-error-mark {
-        opacity: 1;
-        @include prefix((animation: slide-in 3s cubic-bezier(0.770, 0.000, 0.175, 1.000)));
-      }
-    }
-
-
-    .dz-success-mark, .dz-error-mark {
-
-      $image-height: 54px;
-      $image-width: 54px;
-
-      pointer-events: none;
-
-      opacity: 0;
-      z-index: 500;
-
-      position: absolute;
-      display: block;
-      top: 50%;
-      left: 50%;
-      margin-left: -($image-width/2);
-      margin-top: -($image-height/2);
-
-      svg {
-        display: block;
-        width: $image-width;
-        height: $image-height;
-      }
-    }
-    
-      
-    &.dz-processing .dz-progress {
-      opacity: 1;
-      @include prefix((transition: all 0.2s linear));
-    }
-    &.dz-complete .dz-progress {
-      opacity: 0;
-      @include prefix((transition: opacity 0.4s ease-in));
-    }
-
-    &:not(.dz-processing) {
-      .dz-progress {
-        @include prefix((animation: pulse 6s ease infinite));
-      }
-    }
-    .dz-progress {
-
-      opacity: 1;
-      z-index: 1000;
-
-      pointer-events: none;
-      position: absolute;
-      height: 16px;
-      left: 50%;
-      top: 50%;
-      margin-top: -8px;
-
-      width: 80px;
-      margin-left: -40px;
-
-      // border: 2px solid #333;
-      background: rgba(255, 255, 255, 0.9);
-
-      // Fix for chrome bug: https://code.google.com/p/chromium/issues/detail?id=157218
-      -webkit-transform: scale(1);
-
-
-      border-radius: 8px;
-
-      overflow: hidden;
-
-      .dz-upload {
-        background: #333;
-        background: linear-gradient(to bottom, #666, #444);
-        position: absolute;
-        top: 0;
-        left: 0;
-        bottom: 0;
-        width: 0;
-        @include prefix((transition: width 300ms ease-in-out));
-      }
-
-    }
-
-    &.dz-error {
-      .dz-error-message {
-        display: block;
-      }
-      &:hover .dz-error-message {
-        opacity: 1;
-        pointer-events: auto;
-      }
-    }
-
-    .dz-error-message {
-      $width: $image-size + 20px;
-      $color: rgb(190, 38, 38);
-
-      pointer-events: none;
-      z-index: 1000;
-      position: absolute;
-      display: block;
-      display: none;
-      opacity: 0;
-      @include prefix((transition: opacity 0.3s ease));
-      border-radius: 8px;
-      font-size: 13px;
-      top: $image-size + 10px;
-      left: -10px;
-      width: $width;
-      background: $color;
-      background: linear-gradient(to bottom, $color, darken($color, 5%));
-      padding: 0.5em 1.2em;
-      color: white;
-
-      // The triangle pointing up
-      &:after {
-        content: '';
-        position: absolute;
-        top: -6px;
-        left: $width / 2 - 6px;
-        width: 0; 
-        height: 0; 
-        border-left: 6px solid transparent;
-        border-right: 6px solid transparent;
-        border-bottom: 6px solid $color;
-      }
-    }
-
-  }
-}
-
-

examples/demo/site/modules/files/files/scss/files.scss

@@ -1,16 +1,18 @@
 .uploaded-files {
-	table {
 	width: 100%;
 	border-collapse: collapse;
 	border: 1px solid black;
 
 	th {
-			padding: 3px 0 3px 5px;
+	  padding-left: 5px;
+	  padding-top: 3px;
+	  padding-bottom: 3px;
 	}
 
 	td {
-			padding: 3px 0 3px 5px;
+	  padding-left: 5px;
-		}
+	  padding-top: 3px;
+	  padding-bottom: 3px;
 	}
 
 	a.button{
@@ -18,33 +20,23 @@
 		text-decoration: none;
 		border: solid 1px #999;
 		background-color: #ddd;
-		padding: 2px 4px 2px 4px;
 		&:hover {
 			color: black;
-			border: solid 1px #06f;
+			text-decoration: none;
-			background-color: #cff;
 		}
 	}
 }
 
 .upload-files {
-	.center {
+	a.upload-button{
-		text-align: center;
-		padding: 10px;
-	}
-	a.button{
 		margin: auto;
 		width: 100px;
-
 		color: black;
 		text-decoration: none;
-		border: solid 1px #999;
+
-		background-color: #ddd;
-		padding: 2px 4px 2px 4px;
 		&:hover {
 			color: black;
-			border: solid 1px #06f;
+			text-decoration: none;
-			background-color: #cff;
 		}
 	}
 }
@@ -59,5 +51,23 @@
 	text-align: center;
 	padding-top: 15px;
 	padding-bottom: 15px;
-}
 
+	.dz-message {
+	  cursor: pointer;
+	}
+
+
+	.dz-preview, .dz-file-preview, .dz-processing, .dz-success,
+	.dz-image-preview, .dz-complete {
+	  padding: 10px;
+	  margin: 10px;
+	  width: auto;
+	  display: inline-block;
+	}
+
+	.dz-preview {
+	  border: 1px solid black;
+	  border-radius: 5px;
+	  background: #e6e6e6;
+	}
+}

library/model/src/link/cms_link.e

@@ -163,22 +163,6 @@ feature -- Security
 
 feature -- Element change
 
-	set_title (a_title: detachable READABLE_STRING_GENERAL)
-			-- Set `title' to `a_title' or `location'.
-		do
-			if a_title /= Void then
-				title := a_title.as_string_32
-			else
-				title := location.as_string_32
-			end
-		end
-
-	set_location (a_loc: READABLE_STRING_8)
-			-- Set `location' to `a_loc'.
-		do
-			location := a_loc
-		end
-
 	set_weight (a_weight: INTEGER)
 			-- Set `weight' to `a_weight'.
 		do

library/model/src/link/cms_link_composite.e

@@ -18,65 +18,6 @@ feature -- Access
 		deferred
 		end
 
-	item_by_title (a_title: READABLE_STRING_GENERAL): detachable CMS_LINK
-			-- First link with title `a_title' if any.
-		do
-			if attached items as l_items then
-				across
-					l_items as ic
-				until
-					Result /= Void
-				loop
-					Result := ic.item
-					if not a_title.is_case_insensitive_equal (Result.title) then
-						Result := Void
-					end
-				end
-			end
-		ensure
-			coherent_result: Result /= Void implies Result.title.is_case_insensitive_equal_general (a_title)
-		end
-
-	item_by_location (a_loc: READABLE_STRING_8): detachable CMS_LINK
-			-- First link with location `a_loc' if any.
-		do
-			if attached items as l_items then
-				across
-					l_items as ic
-				until
-					Result /= Void
-				loop
-					Result := ic.item
-					if not a_loc.same_string (Result.location) then
-						Result := Void
-					end
-				end
-			end
-		ensure
-			coherent_result: Result /= Void implies Result.location.same_string (a_loc)
-		end
-
-	new_composite_item (a_title: detachable READABLE_STRING_GENERAL; a_location: READABLE_STRING_8): CMS_LINK_COMPOSITE
-			-- If exists, item with location `a_location' or title `a_title',
-			-- otherwise create new local link and extend to Current.
-		local
-			lnk: CMS_LOCAL_LINK
-		do
-			if attached {CMS_LINK_COMPOSITE} item_by_location (a_location) as l_parent then
-				Result := l_parent
-			elseif a_title /= Void and then attached {CMS_LINK_COMPOSITE} item_by_title (a_title) as l_parent then
-				Result := l_parent
-			else
-				create lnk.make (a_title, a_location)
-				extend (lnk)
-				Result := lnk
-			end
-			if attached {CMS_LOCAL_LINK} Result as l_local_lnk and then not l_local_lnk.is_expanded then
-				l_local_lnk.set_expandable (True)
-				l_local_lnk.set_collapsed (True)
-			end
-		end
-
 feature -- Element change		
 
 	extend (lnk: CMS_LINK)
@@ -84,16 +25,6 @@ feature -- Element change
 		deferred
 		end
 
-	extend_into (lnk: CMS_LINK; a_parent_title: detachable READABLE_STRING_GENERAL; a_parent_location: READABLE_STRING_8)
-			-- Extend `lnk' into local link with location `a_parent_location'.
-			-- If the parent is not found, create it with title `a_parent_title'.
-		local
-			l_parent: CMS_LINK_COMPOSITE
-		do
-			l_parent := new_composite_item (a_parent_title, a_parent_location)
-			l_parent.extend (lnk)
-		end
-
 	remove (lnk: CMS_LINK)
 			-- Remove link `lnk' from Current container.
 		deferred
@@ -137,6 +68,6 @@ feature -- status report
 		end
 
 note
-	copyright: "2011-2016, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2015, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

library/model/src/link/cms_local_link.e

@@ -79,6 +79,16 @@ feature -- Security
 
 feature -- Element change
 
+	set_title (a_title: detachable READABLE_STRING_GENERAL)
+			-- Set `title' to `a_title' or `location'.
+		do
+			if a_title /= Void then
+				title := a_title.as_string_32
+			else
+				title := location.as_string_32
+			end
+		end
+
 	add_link (lnk: CMS_LINK)
 			-- <Precursor>
 		local
@@ -184,6 +194,6 @@ feature {NONE} -- Implementation
 invariant
 
 note
-	copyright: "2011-2016, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2015, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

library/model/src/link/cms_menu.e

@@ -104,6 +104,6 @@ feature -- Access
 invariant
 
 note
-	copyright: "2011-2016, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2015, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

modules/admin/cms_admin_module.e

@@ -103,7 +103,7 @@ feature -- Security
 			-- List of permission ids, used by this module, and declared.
 		do
 			Result := Precursor
-			Result.force ("access admin")
+			Result.force ("manage admin")
 			Result.force ("admin users")
 			Result.force ("admin roles")
 			Result.force ("admin modules")
@@ -132,35 +132,28 @@ feature -- Hooks
 	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
 		local
 			lnk: CMS_LOCAL_LINK
-			admin_lnk: CMS_LINK_COMPOSITE
 		do
-			if a_response.api.user_is_authenticated then
+			if
-				admin_lnk := a_menu_system.management_menu.new_composite_item ("Admin", "admin")
+				a_response.has_permission ("manage " + {CMS_ADMIN_MODULE}.name) -- Note: admin user has all permissions enabled by default.
+			then
+					-- TODO: we should probably use more side menu and less primary_menu.
+				create lnk.make ("Admin", "admin")
+				lnk.set_permission_arguments (<<"manage " + {CMS_ADMIN_MODULE}.name>>)
+				a_menu_system.management_menu.extend (lnk)
+
+			end
 
 			create lnk.make ("Module", "admin/modules")
 			lnk.set_permission_arguments (<<"manage module">>)
-				admin_lnk.extend (lnk)
+			a_menu_system.management_menu.extend (lnk)
 
 				-- Per module cache permission!
 			create lnk.make ("Cache", "admin/cache")
-				admin_lnk.extend (lnk)
+			a_menu_system.management_menu.extend (lnk)
 
 				-- Per module export permission!
 			create lnk.make ("Export", "admin/export")
-				admin_lnk.extend (lnk)
+			a_menu_system.management_menu.extend (lnk)
-
---				if
---					a_response.has_permission ("access " + {CMS_ADMIN_MODULE}.name) -- Note: admin user has all permissions enabled by default.
---				then
---					lnk := admin_lnk
---					lnk.set_title ("Admin")
-
---					a_menu_system.management_menu.extend (lnk)
---				elseif admin_lnk.has_children then
---					a_menu_system.management_menu.extend (admin_lnk)
---				end
---				admin_lnk.set_permission_arguments (<<"access " + {CMS_ADMIN_MODULE}.name>>)
-			end
 		end
 
 note

modules/admin/handler/cms_admin_response.e

@@ -17,58 +17,22 @@ feature -- Process
 	process
 		local
 			b: STRING
-			l_admin_links: ARRAYED_LIST [TUPLE [package: READABLE_STRING_8; permissions: ARRAY [READABLE_STRING_GENERAL]; link: CMS_LINK; help: READABLE_STRING_GENERAL]]
-			lst: detachable ARRAYED_LIST [TUPLE [permissions: ARRAY [READABLE_STRING_GENERAL]; link: CMS_LINK; help: READABLE_STRING_GENERAL]]
-			categories: STRING_TABLE [ARRAYED_LIST [TUPLE [permissions: ARRAY [READABLE_STRING_GENERAL]; link: CMS_LINK; help: READABLE_STRING_GENERAL]]]
-			l_package: READABLE_STRING_8
 		do
-			create l_admin_links.make (5)
-			l_admin_links.force (["core", <<"admin users">>, local_link ("Users", "admin/users"), "View/Edit/Add Users"])
-			l_admin_links.force (["core", <<"admin roles">>, local_link ("Roles", "admin/roles"), "View/Edit/Add Roles"])
-			l_admin_links.force (["core", <<"admin modules">>, local_link ("Modules", "admin/modules"), "(un)Install modules"])
-			l_admin_links.force (["support", <<"admin cache">>, local_link ("Cache", "admin/cache"), "Clear caches"])
-			l_admin_links.force (["support", <<"admin export">>, local_link ("Export", "admin/export"), "Export CMS contents, and modules contents."])
-			create categories.make_caseless (3)
-			across
-				l_admin_links as ic
-			loop
-				l_package := ic.item.package
-				lst := categories.item (l_package)
-				if lst = Void then
-					create lst.make (1)
-					categories.force (lst, l_package)
-				end
-				lst.force ([ic.item.permissions, ic.item.link, ic.item.help])
-			end
-
 			create b.make_empty
 			set_title (translation ("Admin Page", Void))
+			b.append ("<ul id=%"content-types%">")
 			fixme ("Check how to make it configurable")
-			across
+			if has_permissions (<< "admin users">>) then
-				categories as cats_ic
+				b.append ("<li>" + link ("Users", "admin/users", Void))
-			loop
+				b.append ("<div class=%"description%">View/Edit/Add Users</div>")
-				lst := cats_ic.item
-				b.append ("<h3>")
-				b.append (html_encoded (cats_ic.key))
-				b.append ("</h3>")
-				b.append ("<ul>")
-				across
-					lst as ic
-				loop
-					if has_permissions (ic.item.permissions) then
-						b.append ("<li>")
-						if attached ic.item.link as lnk then
-							b.append (link (lnk.title, lnk.location, Void))
-						end
-						b.append ("<div class=%"description%">")
-						b.append (html_encoded (ic.item.help))
-						b.append ("</div>")
 				b.append ("</li>")
 			end
+			if has_permissions (<< "admin roles">>) then
+				b.append ("<li>" + link ("Roles", "admin/roles", Void))
+				b.append ("<div class=%"description%">View/Edit/Add Roles</div>")
+				b.append ("</li>")
 			end
 			b.append ("</ul>")
-			end
-
 			set_main_content (b)
 		end
 

modules/auth/cms_auth_module_i.e

@@ -16,8 +16,6 @@ inherit
 
 	CMS_HOOK_MENU_SYSTEM_ALTER
 
-	CMS_HOOK_BLOCK_HELPER
-
 	SHARED_LOGGER
 
 feature {NONE} -- Initialization
@@ -88,4 +86,23 @@ feature -- Hooks
 			end
 		end
 
+feature {NONE} -- Helpers
+
+	template_block (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE): detachable CMS_SMARTY_TEMPLATE_BLOCK
+			-- Smarty content block for `a_block_id'
+		local
+			p: detachable PATH
+		do
+			create p.make_from_string ("templates")
+			p := p.extended ("block_").appended (a_block_id).appended_with_extension ("tpl")
+			p := a_response.api.module_theme_resource_location (Current, p)
+			if p /= Void then
+				if attached p.entry as e then
+					create Result.make (a_block_id, Void, p.parent, e)
+				else
+					create Result.make (a_block_id, Void, p.parent, p)
+				end
+			end
+		end
+
 end

modules/auth/cms_authentication_module.e

@@ -21,8 +21,6 @@ inherit
 
 	CMS_HOOK_BLOCK
 
-	CMS_HOOK_BLOCK_HELPER
-
 	CMS_HOOK_MENU_SYSTEM_ALTER
 
 	SHARED_EXECUTION_ENVIRONMENT
@@ -194,7 +192,7 @@ feature -- Hooks configuration
 				 -- Add the link to the taxonomy to the main menu
 			if a_response.has_permission ("admin registration") then
 				create lnk.make ("Registration", "admin/pending-registrations/")
-				a_menu_system.management_menu.extend_into (lnk, "Admin", "admin")
+				a_menu_system.management_menu.extend (lnk)
 			end
 		end
 
@@ -210,7 +208,7 @@ feature -- Handler
 			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
 			create b.make_empty
 			l_user := r.user
-			if attached template_block (Current, "account_info", api) as l_tpl_block then
+			if attached template_block ("account_info", r) as l_tpl_block then
 				l_tpl_block.set_weight (-10)
 				r.add_block (l_tpl_block, "content")
 			else
@@ -248,7 +246,7 @@ feature -- Handler
 			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
 			create b.make_empty
 			l_user := r.user
-			if attached template_block (Current, "account_edit", api) as l_tpl_block then
+			if attached template_block ("account_edit", r) as l_tpl_block then
 				l_tpl_block.set_weight (-10)
 				r.add_block (l_tpl_block, "content")
 			else
@@ -833,7 +831,7 @@ feature -- Handler
 
 	block_list: ITERABLE [like {CMS_BLOCK}.name]
 		do
-			Result := <<"register", "reactivate", "new_password", "reset_password">>
+			Result := <<"register", "reactivate", "new_password", "reset_password", "registration">>
 		end
 
 	get_block_view (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
@@ -849,6 +847,8 @@ feature -- Handler
 				get_block_view_new_password (a_block_id, a_response)
 			elseif a_block_id.is_case_insensitive_equal_general ("reset_password") and then loc.starts_with ("account/reset-password") then
 				get_block_view_reset_password (a_block_id, a_response)
+			elseif a_block_id.is_case_insensitive_equal_general ("registration") and then loc.starts_with ("admin/pending-registrations") then
+				get_block_view_registration (a_block_id, a_response)
 			end
 		end
 
@@ -923,24 +923,32 @@ feature {NONE} -- Token Generation
 			Result := l_token
 		end
 
+feature {NONE} -- Helpers
+
+	template_block (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE): detachable CMS_SMARTY_TEMPLATE_BLOCK
+			-- Smarty content block for `a_block_id'
+		local
+			p: detachable PATH
+		do
+			create p.make_from_string ("templates")
+			p := p.extended ("block_").appended (a_block_id).appended_with_extension ("tpl")
+			p := a_response.api.module_theme_resource_location (Current, p)
+			if p /= Void then
+				if attached p.entry as e then
+					create Result.make (a_block_id, Void, p.parent, e)
+				else
+					create Result.make (a_block_id, Void, p.parent, p)
+				end
+			end
+		end
+
 feature {NONE} -- Block views
 
 	get_block_view_register (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
 		do
 			if a_response.has_permission ("account register") then
-				if
+				if a_response.request.is_get_request_method then
-					a_response.request.is_get_request_method
+					if attached template_block (a_block_id, a_response) as l_tpl_block then
-					or else (
-						a_response.values.has ("error_name")
-						or else a_response.values.has ("error_email")
-					)
-				then
-					if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
---						l_tpl_block.set_value (a_response.values.item ("error_name"), "error_name")
---						l_tpl_block.set_value (a_response.values.item ("error_email"), "error_email")
---						l_tpl_block.set_value (a_response.values.item ("email"), "email")
---						l_tpl_block.set_value (a_response.values.item ("name"), "name")
-						l_tpl_block.set_value (form_registration_application_description (a_response.api), "application_description")
 						if attached recaptcha_site_key (a_response.api) as l_recaptcha_site_key then
 							l_tpl_block.set_value (l_recaptcha_site_key, "recaptcha_site_key")
 						end
@@ -951,13 +959,30 @@ feature {NONE} -- Block views
 						end
 					end
 				elseif a_response.request.is_post_request_method then
-					if attached template_block (Current, "post_register", a_response.api) as l_tpl_block then
+					if a_response.values.has ("error_name") or else a_response.values.has ("error_email") then
+						if attached template_block (a_block_id, a_response) as l_tpl_block then
+								--						l_tpl_block.set_value (a_response.values.item ("error_name"), "error_name")
+								--						l_tpl_block.set_value (a_response.values.item ("error_email"), "error_email")
+								--						l_tpl_block.set_value (a_response.values.item ("email"), "email")
+								--						l_tpl_block.set_value (a_response.values.item ("name"), "name")
+							if attached recaptcha_site_key (a_response.api) as l_recaptcha_site_key then
+								l_tpl_block.set_value (l_recaptcha_site_key, "recaptcha_site_key")
+							end
 							a_response.add_block (l_tpl_block, "content")
 						else
 							debug ("cms")
 								a_response.add_warning_message ("Error with block [" + a_block_id + "]")
 							end
 						end
+					else
+						if attached template_block ("post_register", a_response) as l_tpl_block then
+							a_response.add_block (l_tpl_block, "content")
+						else
+							debug ("cms")
+								a_response.add_warning_message ("Error with block [" + a_block_id + "]")
+							end
+						end
+					end
 				end
 			end
 		end
@@ -965,7 +990,7 @@ feature {NONE} -- Block views
 	get_block_view_reactivate (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
 		do
 			if a_response.request.is_get_request_method then
-				if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+				if attached template_block (a_block_id, a_response) as l_tpl_block then
 					a_response.add_block (l_tpl_block, "content")
 				else
 					debug ("cms")
@@ -974,7 +999,7 @@ feature {NONE} -- Block views
 				end
 			elseif a_response.request.is_post_request_method then
 				if a_response.values.has ("error_email") or else a_response.values.has ("is_active") then
-					if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+					if attached template_block (a_block_id, a_response) as l_tpl_block then
 							--						l_tpl_block.set_value (a_response.values.item ("error_email"), "error_email")
 							--						l_tpl_block.set_value (a_response.values.item ("email"), "email")
 							--						l_tpl_block.set_value (a_response.values.item ("is_active"), "is_active")
@@ -985,7 +1010,7 @@ feature {NONE} -- Block views
 						end
 					end
 				else
-					if attached template_block (Current, "post_reactivate", a_response.api) as l_tpl_block then
+					if attached template_block ("post_reactivate", a_response) as l_tpl_block then
 						a_response.add_block (l_tpl_block, "content")
 					else
 						debug ("cms")
@@ -999,7 +1024,7 @@ feature {NONE} -- Block views
 	get_block_view_new_password (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
 		do
 			if a_response.request.is_get_request_method then
-				if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+				if attached template_block (a_block_id, a_response) as l_tpl_block then
 					a_response.add_block (l_tpl_block, "content")
 				else
 					debug ("cms")
@@ -1008,7 +1033,7 @@ feature {NONE} -- Block views
 				end
 			elseif a_response.request.is_post_request_method then
 				if a_response.values.has ("error_email") or else a_response.values.has ("error_username") then
-					if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+					if attached template_block (a_block_id, a_response) as l_tpl_block then
 							--						l_tpl_block.set_value (a_response.values.item ("error_email"), "error_email")
 							--						l_tpl_block.set_value (a_response.values.item ("email"), "email")
 							--						l_tpl_block.set_value (a_response.values.item ("error_username"), "error_username")
@@ -1020,7 +1045,7 @@ feature {NONE} -- Block views
 						end
 					end
 				else
-					if attached template_block (Current, "post_password", a_response.api) as l_tpl_block then
+					if attached template_block ("post_password", a_response) as l_tpl_block then
 						a_response.add_block (l_tpl_block, "content")
 					else
 						debug ("cms")
@@ -1034,7 +1059,7 @@ feature {NONE} -- Block views
 	get_block_view_reset_password (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
 		do
 			if a_response.request.is_get_request_method then
-				if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+				if attached template_block (a_block_id, a_response) as l_tpl_block then
 						--					l_tpl_block.set_value (a_response.values.item ("token"), "token")
 						--					l_tpl_block.set_value (a_response.values.item ("error_token"), "error_token")
 					a_response.add_block (l_tpl_block, "content")
@@ -1045,7 +1070,7 @@ feature {NONE} -- Block views
 				end
 			elseif a_response.request.is_post_request_method then
 				if a_response.values.has ("error_token") or else a_response.values.has ("error_password") then
-					if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+					if attached template_block (a_block_id, a_response) as l_tpl_block then
 							--						l_tpl_block.set_value (a_response.values.item ("error_token"), "error_token")
 							--						l_tpl_block.set_value (a_response.values.item ("error_password"), "error_password")
 							--						l_tpl_block.set_value (a_response.values.item ("token"), "token")
@@ -1056,7 +1081,7 @@ feature {NONE} -- Block views
 						end
 					end
 				else
-					if attached template_block (Current, "post_reset", a_response.api) as l_tpl_block then
+					if attached template_block ("post_reset", a_response) as l_tpl_block then
 						a_response.add_block (l_tpl_block, "content")
 					else
 						debug ("cms")
@@ -1067,20 +1092,12 @@ feature {NONE} -- Block views
 			end
 		end
 
-feature -- Access: configuration
+	get_block_view_registration	(a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
-
-	form_registration_application_description (api: CMS_API): detachable READABLE_STRING_8
-			-- Get recaptcha security key.
-		local
-			utf: UTF_CONVERTER
 		do
-			if attached api.module_configuration (Current, Void) as cfg then
-				if attached cfg.text_item ("forms.registration.application_description") as l_desc and then not l_desc.is_whitespace then
-					Result := utf.utf_32_string_to_utf_8_string_8 (l_desc)
-				end
-			end
 		end
 
+feature -- Recaptcha
+
 	recaptcha_secret_key (api: CMS_API): detachable READABLE_STRING_8
 			-- Get recaptcha security key.
 		local
@@ -1112,7 +1129,6 @@ feature -- Response Alter
 			a_response.add_javascript_url ("https://www.google.com/recaptcha/api.js")
 			a_response.add_style (a_response.url ("/module/" + name + "/files/css/auth.css", Void), Void)
 		end
-
 feature {NONE} -- Implementation
 
 	is_captcha_verified (a_secret, a_response: READABLE_STRING_8): BOOLEAN

modules/auth/site/auth.json

@@ -0,0 +1,8 @@
+{
+	"email": "webmaster@example.com",
+	"subjet_register": "Thank you for regitering with us, activate account",
+	"subjet_activate": "New account ativation token",
+	"subjet_password": "Password Recovery!!!",
+	"subjet_oauth": "Welcome",
+	"smtp": "127.0.0.1"
+}

modules/auth/site/config/auth.json

@@ -1,10 +1,5 @@
 {
 	"subject": "Thank you for contacting us",
-	"forms": {
-		"registration": {
-			"application_description": "Present yourself in a few lines, otherwise your application is likely to be rejected."
-		}
-	},
 	"recaptcha": {
 		"site_key":"6Lex9RMTAAAAAKleC4x6TaRlFcpLbEWgH_U7MSiD",
 		"secret_key":"6Lex9RMTAAAAAAkBczvX5DUiyg_xoM_EthVVgRRx"

modules/auth/site/templates/block_register.tpl

@@ -1,4 +1,4 @@
-<div>
+ <div>
     <form action="{$site_url/}account/roc-register" method="post">
         <fieldset>
             <legend>Registration</legend>
@@ -17,21 +17,22 @@
                 <input type="email" id="email" name="email"  value="{$email/}"  required/>
                 <label for="email">Email</label>
                 {if isset="$error_email"}
-				<span><i>{$error_email/}</i></span> <br/>
+                    <span><i>{$error_email/}</i></span> <br>
                 {/if}
             </div>
             <div>
-				<textarea rows="4" cols="50" name="personal_information" id="personal_information" required>{$personal_information/}</textarea>
+               <textarea rows="4" cols="50" name="personal_information" id="personal_information" required>
+			   				{$personal_information/}
+			   </textarea>
 			   <label for="personal_information">Tell us why you want to register an account</label>
                 {if isset="$error_application"}
-				<span><i>{$error_application/}</i></span><br/>
+                    <span><i>{$error_application/}</i></span> <br>
-				{/if}
-				{if isset="$application_description"}
-				<br/>
-				<p class="description">{$application_description/}</p>
                 {/if}
             </div>
-			{unless isempty="$recaptcha_site_key"}<div class="g-recaptcha" data-sitekey="{$recaptcha_site_key/}"></div><br/>{/unless}
+            {unless isempty="$recaptcha_site_key"}
+        		<div class="g-recaptcha" data-sitekey="{$recaptcha_site_key/}"></div>
+        	<br/>
+			{/unless}
             <button type="submit">Register</button>
         </fieldset>    
     </form>

modules/basic_auth/cms_basic_auth_module.e

@@ -118,7 +118,7 @@ feature {NONE} -- Implementation: routes
 				r.add_error_message ("You are already signed in!")
 				r.set_main_content (r.link ("Logout", "account/roc-logout", Void))
 			else
-				if attached template_block (Current, "login", api) as l_tpl_block then
+				if attached template_block ("login", r) as l_tpl_block then
 					r.add_javascript_url (r.url ("module/" + name + "/files/js/roc_basic_auth.js", Void))
 
 					create vals.make (1)
@@ -170,7 +170,7 @@ feature {NONE} -- Block views
 		local
 			vals: CMS_VALUE_TABLE
 		do
-			if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+			if attached template_block (a_block_id, a_response) as l_tpl_block then
 				create vals.make (1)
 					-- add the variable to the block
 				a_response.api.hooks.invoke_value_table_alter (vals, a_response)

modules/basic_auth/site/templates/block_login.tpl

@@ -1,6 +1,6 @@
 {unless isset="$user"}
  	<div class="login-box">
-		<div class="description">The "Basic Auth" relies on the HTTP basic access authentication.<br/>(see also: <a href="https://en.wikipedia.org/wiki/Basic_access_authentication">https://en.wikipedia.org/wiki/Basic_access_authentication</a> )</div>
+		<div class="description">The "Basic Auth" relies on the HTTP basic acces authentication.<br/>(see also: <a href="https://en.wikipedia.org/wiki/Basic_access_authentication">https://en.wikipedia.org/wiki/Basic_access_authentication</a> )</div>
 		<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
 		<div>
 			<form name="cms_basic_auth" action="{$site_url/}roc-basic-login" method="POST">

modules/contact/src/cms_contact_module.e

@@ -181,7 +181,7 @@ feature -- Hooks
 			if a_block_id.is_case_insensitive_equal_general ("contact") then
 					-- "contact", "post_contact"
 				if a_response.request.is_get_request_method then
-					if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+					if attached template_block (Current, a_block_id, a_response) as l_tpl_block then
 						if attached recaptcha_site_key (a_response.api) as l_recaptcha_site_key then
 							l_tpl_block.set_value (l_recaptcha_site_key, "recaptcha_site_key")
 						end
@@ -201,7 +201,7 @@ feature -- Hooks
 			f: CMS_FORM
 		do
 			a_response.add_style (a_response.url ("/module/" + name + "/files/css/contact.css", Void), Void)
-			if attached template_block (Current, "contact", api) as l_tpl_block then
+			if attached template_block (Current, "contact", a_response) as l_tpl_block then
 				if attached recaptcha_site_key (api) as l_recaptcha_site_key then
 					l_tpl_block.set_value (l_recaptcha_site_key, "recaptcha_site_key")
 				end
@@ -339,7 +339,7 @@ feature -- Hooks
 						r.values.force (True, "has_error")
 						vars.put ("True", "has_error")
 					end
-					if attached template_block_with_values (Current, "post_contact", api, vars) as l_tpl_block then
+					if attached template_block_with_values (Current, "post_contact", r, vars) as l_tpl_block then
 						across
 							r.values as tb
 						loop
@@ -354,7 +354,7 @@ feature -- Hooks
 						-- send a bad request status code and redisplay the form with the previous data loaded.	
 					r.set_value (False, "error")
 					r.set_status_code ({HTTP_STATUS_CODE}.bad_request)
-					if attached template_block_with_values (Current, "contact", api, vars) as l_tpl_block then
+					if attached template_block_with_values (Current, "contact", r, vars) as l_tpl_block then
 						across
 							r.values as tb
 						loop
@@ -377,7 +377,7 @@ feature -- Hooks
 				write_error_log (generator + ".handle_post_contact:  Internal Server error")
 				r.values.force (True, "has_error")
 				r.set_status_code ({HTTP_CONSTANTS}.internal_server_error)
-				if attached template_block_with_values (Current, "post_contact", api, vars) as l_tpl_block then
+				if attached template_block_with_values (Current, "post_contact", r, vars) as l_tpl_block then
 					across
 						r.values as tb
 					loop
@@ -422,6 +422,18 @@ feature {NONE} -- Helpers
 
 feature {NONE} -- Contact Message
 
+	template_block_with_values (a_module: CMS_MODULE; a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE; a_values: STRING_TABLE [ANY]): like template_block
+		do
+			Result := template_block (a_module, a_block_id, a_response)
+			if Result /= Void then
+				across
+					a_values as ic
+				loop
+					Result.set_value (ic.item, ic.key)
+				end
+			end
+		end
+
 	email_html_message (a_message_id: READABLE_STRING_8; a_response: CMS_RESPONSE; a_html_encoded_values: STRING_TABLE [READABLE_STRING_8]): STRING
 			-- html message related to `a_message_id'.
 		local

modules/feed_aggregator/feed_aggregator_module.e

@@ -346,11 +346,9 @@ feature -- Hook
 			-- Hook execution on collection of menu contained by `a_menu_system'
 			-- for related response `a_response'.
 		do
-			if a_response.is_authenticated then
 			a_menu_system.navigation_menu.extend (create {CMS_LOCAL_LINK}.make ("Feeds", "feed_aggregation/"))
 			if a_response.has_permission (permission__manage_feed_aggregator) then
-					a_menu_system.management_menu.extend_into (create {CMS_LOCAL_LINK}.make ("Feeds (admin)", "admin/feed_aggregator/"), "Admin", "admin")
+				a_menu_system.management_menu.extend (create {CMS_LOCAL_LINK}.make ("Feeds (admin)", "admin/feed_aggregator/"))
-				end
 			end
 		end
 

modules/files/cms_files_api.e

@@ -103,7 +103,7 @@ feature -- Storage
 			end
 		end
 
-	save_uploaded_file (uf: CMS_UPLOADED_FILE)
+	save_uploaded_file (f: CMS_UPLOADED_FILE)
 		local
 			p: PATH
 			ut: FILE_UTILITIES
@@ -113,9 +113,9 @@ feature -- Storage
 			finished: BOOLEAN
 		do
 			reset_error
-			create original_name.make_from_string (uf.filename)
+			create original_name.make_from_string (f.filename)
 
-			p := uf.location
+			p := f.location
 			if not p.is_absolute then
 				p := uploads_directory.extended_path (p)
 			end
@@ -128,8 +128,8 @@ feature -- Storage
 					finished
 				loop
 					if ut.file_path_exists (p) then
-						uf.set_new_location_with_number (n)
+						f.set_new_location_with_number (n)
-						p := uf.location
+						p := f.location
 						if p.is_absolute then
 						else
 							p := uploads_directory.extended_path (p)
@@ -139,15 +139,13 @@ feature -- Storage
 						finished := True
 					end
 				end
-				stored := uf.move_to (p)
+				stored := f.move_to (p)
 			else
 					-- move file to path
-				stored := uf.move_to (p)
+				stored := f.move_to (p)
 			end
 
-			if stored then
+			if not stored then
-				save_metadata_from_uploaded_file (uf, cms_api.user)
-			else
 				error_handler.add_custom_error (-1, "uploaded file storage failed", "Issue occurred when saving uploaded file!")
 			end
 		end
@@ -158,7 +156,7 @@ feature -- Storage
 			h_date: HTTP_DATE
 			retried: BOOLEAN
 		do
-			if retried then
+			if not retried then
 					-- FIXME: Report error?
 				if f /= Void and then not f.is_closed then
 					f.close
@@ -174,7 +172,7 @@ feature -- Storage
 				end
 					-- insert username
 				if u /= Void then
-					f.put_string (u.id.out)
+					f.put_integer_64 (u.id)
 					f.put_new_line
 --					f.put_string (utf.utf_32_string_to_utf_8_string_8 (u.name))
 --					f.put_new_line
@@ -184,7 +182,7 @@ feature -- Storage
 				end
 					-- insert uploaded_time
 				create h_date.make_now_utc
-				f.put_string (h_date.timestamp.out)
+				f.put_integer_64 (h_date.timestamp)
 				f.put_new_line
 
 					-- insert size of file

modules/files/cms_files_module.e

@@ -43,15 +43,10 @@ feature -- Access
 			-- List of permission ids, used by this module, and declared.
 		do
 			Result := Precursor
-			Result.force (admin_files_permission)
+			Result.force ("admin files")
-			Result.force (upload_files_permission)
+			Result.force ("upload files")
-			Result.force (browse_files_permission)
 		end
 
-	admin_files_permission: STRING = "admin files"
-	upload_files_permission: STRING = "upload files"
-	browse_files_permission: STRING = "browse files"
-
 feature {CMS_API} -- Module Initialization
 
 	initialize (api: CMS_API)
@@ -97,7 +92,7 @@ feature -- Access: router
 		do
 			map_uri_template_agent (a_router, "/" + uploads_location, agent execute_upload (?, ?, a_api), Void) -- Accepts any method GET, HEAD, POST, PUT, DELETE, ...
 			map_uri_template_agent (a_router, "/" + uploads_location + "{filename}", agent display_uploaded_file_info (?, ?, a_api), a_router.methods_get)
-			map_uri_template_agent (a_router, "/" + uploads_location + "remove/{filename}", agent remove_file (?, ?, a_api), a_router.methods_get)
+			map_uri_template_agent (a_router, "/" + uploads_location + "remove/{filename}", agent remove (?, ?, a_api), a_router.methods_get)
 		end
 
 	uploads_location: STRING = "upload/"
@@ -114,7 +109,7 @@ feature -- Hooks
 			link: CMS_LOCAL_LINK
 		do
 			-- login in demo did somehow not work
-			if a_response.has_permission (upload_files_permission) then
+			if a_response.has_permission ("upload files") then
 				create link.make ("Upload files", uploads_location)
 				a_menu_system.navigation_menu.extend (link)
 			end
@@ -138,17 +133,13 @@ feature -- Handler
 			fn: READABLE_STRING_32
 		do
 			check req.is_get_request_method end
-			if not api.has_permission (browse_files_permission) then
-				create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
-				r.add_error_message ("You are not allowed to browse CMS files!")
-			elseif attached {WSF_STRING} req.path_parameter ("filename") as p_filename then
 			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
 
 				-- add style
 			r.add_style (r.url ("/module/" + name + "/files/css/files.css", Void), Void)
 
 			create body.make_empty
-
+			if attached {WSF_STRING} req.path_parameter ("filename") as p_filename then
 				fn := p_filename.value
 				r.set_page_title ({STRING_32} "File %"" + fn + {STRING_32} "%"")
 				body.append ("<div class=%"uploaded-files%">%N") -- To ease css customization.
@@ -216,13 +207,9 @@ feature -- Handler
 					body.append ("</div>%N") -- Overview
 				end
 				body.append ("</div>%N")
-
+			end
 			r.add_to_primary_tabs (create {CMS_LOCAL_LINK}.make ("Uploaded files", uploads_location))
 			r.set_main_content (body)
-			else
-				create {BAD_REQUEST_ERROR_CMS_RESPONSE} r.make (req, res, api)
-				r.set_main_content ("Missing 'filename' field value!")
-			end
 			r.execute
 		end
 
@@ -242,9 +229,8 @@ feature -- Handler
 
 					-- add JS for dropzone
 				r.add_javascript_url (r.url ("/module/" + name + "/files/js/dropzone.js", void))
-				r.add_style (r.url ("/module/" + name + "/files/js/dropzone.css", void), void)
 
-				if api.has_permission (upload_files_permission) then
+				if r.has_permission ("upload files") then
 						-- create body
 					body.append ("<p>Please choose some file(s) to upload.</p>")
 
@@ -252,7 +238,7 @@ feature -- Handler
 					body.append ("<div class=%"upload-files%">")
 					body.append ("<form action=%"" + r.url (uploads_location, Void) + "%" class=%"dropzone%">")
 					body.append ("</form>%N")
-					body.append ("<div class=%"center%"><a class=%"button%" href=%""+ r.url (uploads_location, Void) +"%">Upload Files</a></div>")
+					body.append ("<a class=%"button%" href=%""+ r.url (uploads_location, Void) +"%">Upload Files</a>")
 					body.append ("</div>")
 					if req.is_post_request_method then
 						process_uploaded_files (req, api, body)
@@ -262,11 +248,8 @@ feature -- Handler
 				end
 
 					-- Build the response.
-				if r.has_permission (browse_files_permission) then
+
 				append_uploaded_file_album_to (req, api, body)
-				else
-					r.add_warning_message ("You are not allowed to browse files!")
-				end
 
 				r.set_main_content (body)
 			else
@@ -276,9 +259,7 @@ feature -- Handler
 		end
 
 	process_uploaded_files (req: WSF_REQUEST; api: CMS_API; a_output: STRING)
-			-- Process http request uploaded files.
+			-- show all newly uploaded files
-		require
-			has_permission: api.has_permission (upload_files_permission)
 		local
 			l_uploaded_file: CMS_UPLOADED_FILE
 			uf: WSF_UPLOADED_FILE
@@ -296,12 +277,14 @@ feature -- Handler
 						a_output.append ("<li>")
 						a_output.append (api.html_encoded (l_uploaded_file.filename))
 
+							-- store the just uploaded file
+						l_files_api.save_uploaded_file (l_uploaded_file)
+
 							-- create medadata file
 						l_uploaded_file.set_size (uf.size)
 						l_uploaded_file.set_type (uf.content_type)
 
-							-- store the just uploaded file
+						l_files_api.save_metadata_from_uploaded_file (l_uploaded_file, api.current_user (req))
-						l_files_api.save_uploaded_file (l_uploaded_file)
 
 						if l_files_api.has_error then
 							a_output.append (" <span class=%"error%">: upload failed!</span>")
@@ -320,14 +303,14 @@ feature -- Handler
 			p: PATH
 			rel: PATH
 			md: detachable CMS_FILE_METADATA
+			size: INTEGER
 		do
 			if attached files_api as l_files_api then
 				rel := l_files_api.uploads_relative_path
 				p := l_files_api.uploads_directory
 
-				a_output.append ("<div class=%"uploaded-files%">%N")
 				a_output.append ("<strong>Uploaded files:</strong>%N")
-				a_output.append ("<table>%N")
+				a_output.append ("<table class=%"uploaded-files%">%N")
 				a_output.append ("<tr><th>Filename</th><th>Uploading Time</th><th>User</th><th>Size</th><th></th><th></th></tr>%N")
 
 				create d.make_with_path (p)
@@ -378,7 +361,18 @@ feature -- Handler
 										-- add size
 									a_output.append ("<td class=%"size%">")
 									if md.size > 0 then
-										a_output.append (file_size_human_string (md.size))
+										size := md.size
+										if size >= 1000000 then
+											size := size // 1000000
+											a_output.append (size.out + " MB")
+										else
+											if size >= 1000 then
+												size := size // 1000
+												a_output.append (size.out + " kB")
+											else
+												a_output.append (size.out + " bytes")
+											end
+										end
 									else
 										a_output.append ("NA")
 									end
@@ -387,12 +381,12 @@ feature -- Handler
 
 									-- add download link
 								a_output.append ("<td>")
-								a_output.append ("<a class=%"button%" href=%"" + req.script_url ("/" + l_files_api.file_link (f).location) + "%" download>Download</a>%N")
+								a_output.append ("<button><a class=%"download-button%" href=%"" + req.script_url ("/" + l_files_api.file_link (f).location) + "%" download>Download</a></button>%N")
 								a_output.append ("</td>%N")
 
 									-- add remove button
 								a_output.append ("<td>")
-								a_output.append ("<a class=%"button%" href=%"" + req.script_url ("/" + uploads_location + "remove/" + f.filename) + "%">Remove</a>%N")
+								a_output.append ("<button><a class=%"download-button%" href=%"" + req.script_url ("/" + uploads_location + "remove/" + f.filename) + "%">Remove</a></button>%N")
 								a_output.append ("</td>%N")
 
 								a_output.append ("</tr>%N")
@@ -420,21 +414,18 @@ feature -- Handler
 					end
 				end
 				a_output.append ("</table>%N")
-				a_output.append ("</div>%N")
 			end
 		end
 
-	remove_file (req: WSF_REQUEST; res: WSF_RESPONSE; api: CMS_API)
+	remove (req: WSF_REQUEST; res: WSF_RESPONSE; api: CMS_API)
 		local
 			body: STRING
 			r: CMS_RESPONSE
 			err: BOOLEAN
 		do
+
 			if attached files_api as l_files_api then
-				if not api.has_permission (admin_files_permission) then
+				if attached {WSF_STRING} req.path_parameter ("filename") as p_filename then
-					create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
-					r.add_error_message ("You are not allowed to remove file!")
-				elseif attached {WSF_STRING} req.path_parameter ("filename") as p_filename then
 					create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
 
 					l_files_api.delete_file (p_filename.value)

modules/files/site/files/css/files.css

@@ -1,44 +1,38 @@
-.uploaded-files table {
+.uploaded-files {
   width: 100%;
   border-collapse: collapse;
   border: 1px solid black;
 }
-.uploaded-files table th {
+.uploaded-files th {
-  padding: 3px 0 3px 5px;
+  padding-left: 5px;
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
-.uploaded-files table td {
+.uploaded-files td {
-  padding: 3px 0 3px 5px;
+  padding-left: 5px;
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
 .uploaded-files a.button {
   color: black;
   text-decoration: none;
   border: solid 1px #999;
   background-color: #ddd;
-  padding: 2px 4px 2px 4px;
 }
 .uploaded-files a.button:hover {
   color: black;
-  border: solid 1px #06f;
+  text-decoration: none;
-  background-color: #cff;
 }
 
-.upload-files .center {
+.upload-files a.upload-button {
-  text-align: center;
-  padding: 10px;
-}
-.upload-files a.button {
   margin: auto;
   width: 100px;
   color: black;
   text-decoration: none;
-  border: solid 1px #999;
-  background-color: #ddd;
-  padding: 2px 4px 2px 4px;
 }
-.upload-files a.button:hover {
+.upload-files a.upload-button:hover {
   color: black;
-  border: solid 1px #06f;
+  text-decoration: none;
-  background-color: #cff;
 }
 
 /******************* Drop Zone *******************/
@@ -50,3 +44,18 @@
   padding-top: 15px;
   padding-bottom: 15px;
 }
+.dropzone .dz-message {
+  cursor: pointer;
+}
+.dropzone .dz-preview, .dropzone .dz-file-preview, .dropzone .dz-processing, .dropzone .dz-success,
+.dropzone .dz-image-preview, .dropzone .dz-complete {
+  padding: 10px;
+  margin: 10px;
+  width: auto;
+  display: inline-block;
+}
+.dropzone .dz-preview {
+  border: 1px solid black;
+  border-radius: 5px;
+  background: #e6e6e6;
+}

modules/files/site/files/js/dropzone.js

@@ -24,14 +24,16 @@
  * THE SOFTWARE.
  *
  */
-var Dropzone, Emitter, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
+
+(function() {
+  var Dropzone, Emitter, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
     __slice = [].slice,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-noop = function() {};
+  noop = function() {};
 
-Emitter = (function() {
+  Emitter = (function() {
     function Emitter() {}
 
     Emitter.prototype.addEventListener = Emitter.prototype.on;
@@ -91,9 +93,9 @@ Emitter = (function() {
 
     return Emitter;
 
-})();
+  })();
 
-Dropzone = (function(_super) {
+  Dropzone = (function(_super) {
     var extend, resolveOption;
 
     __extends(Dropzone, _super);
@@ -136,7 +138,6 @@ Dropzone = (function(_super) {
       previewsContainer: null,
       hiddenInputContainer: "body",
       capture: null,
-    renameFilename: null,
       dictDefaultMessage: "Drop files here to upload",
       dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.",
       dictFallbackText: "Please use the fallback form below to upload your files like in the olden days.",
@@ -258,7 +259,7 @@ Dropzone = (function(_super) {
           _ref = file.previewElement.querySelectorAll("[data-dz-name]");
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
             node = _ref[_i];
-          node.textContent = this._renameFilename(file.name);
+            node.textContent = file.name;
           }
           _ref1 = file.previewElement.querySelectorAll("[data-dz-size]");
           for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
@@ -719,13 +720,6 @@ Dropzone = (function(_super) {
       }
     };
 
-  Dropzone.prototype._renameFilename = function(name) {
-    if (typeof this.options.renameFilename !== "function") {
-      return name;
-    }
-    return this.options.renameFilename(name);
-  };
-
     Dropzone.prototype.getFallbackForm = function() {
       var existingFallback, fields, fieldsString, form;
       if (existingFallback = this.getExistingFallback()) {
@@ -927,16 +921,11 @@ Dropzone = (function(_super) {
     };
 
     Dropzone.prototype._addFilesFromDirectory = function(directory, path) {
-    var dirReader, errorHandler, readEntries;
+      var dirReader, entriesReader;
       dirReader = directory.createReader();
-    errorHandler = function(error) {
+      entriesReader = (function(_this) {
-      return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
+        return function(entries) {
-    };
-    readEntries = (function(_this) {
-      return function() {
-        return dirReader.readEntries(function(entries) {
           var entry, _i, _len;
-          if (entries.length > 0) {
           for (_i = 0, _len = entries.length; _i < _len; _i++) {
             entry = entries[_i];
             if (entry.isFile) {
@@ -951,13 +940,11 @@ Dropzone = (function(_super) {
               _this._addFilesFromDirectory(entry, "" + path + "/" + entry.name);
             }
           }
-            readEntries();
-          }
-          return null;
-        }, errorHandler);
         };
       })(this);
-    return readEntries();
+      return dirReader.readEntries(entriesReader, function(error) {
+        return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
+      });
     };
 
     Dropzone.prototype.accept = function(file, done) {
@@ -1375,7 +1362,7 @@ Dropzone = (function(_super) {
         }
       }
       for (i = _m = 0, _ref5 = files.length - 1; 0 <= _ref5 ? _m <= _ref5 : _m >= _ref5; i = 0 <= _ref5 ? ++_m : --_m) {
-      formData.append(this._getParamName(i), files[i], this._renameFilename(files[i].name));
+        formData.append(this._getParamName(i), files[i], files[i].name);
       }
       return this.submitRequest(xhr, formData, files);
     };
@@ -1420,23 +1407,23 @@ Dropzone = (function(_super) {
 
     return Dropzone;
 
-})(Emitter);
+  })(Emitter);
 
-Dropzone.version = "4.3.0";
+  Dropzone.version = "4.2.0";
 
-Dropzone.options = {};
+  Dropzone.options = {};
 
-Dropzone.optionsForElement = function(element) {
+  Dropzone.optionsForElement = function(element) {
     if (element.getAttribute("id")) {
       return Dropzone.options[camelize(element.getAttribute("id"))];
     } else {
       return void 0;
     }
-};
+  };
 
-Dropzone.instances = [];
+  Dropzone.instances = [];
 
-Dropzone.forElement = function(element) {
+  Dropzone.forElement = function(element) {
     if (typeof element === "string") {
       element = document.querySelector(element);
     }
@@ -1444,11 +1431,11 @@ Dropzone.forElement = function(element) {
       throw new Error("No Dropzone found for given element. This is probably because you're trying to access it before Dropzone had the time to initialize. Use the `init` option to setup any additional observers on your Dropzone.");
     }
     return element.dropzone;
-};
+  };
 
-Dropzone.autoDiscover = true;
+  Dropzone.autoDiscover = true;
 
-Dropzone.discover = function() {
+  Dropzone.discover = function() {
     var checkElements, dropzone, dropzones, _i, _len, _results;
     if (document.querySelectorAll) {
       dropzones = document.querySelectorAll(".dropzone");
@@ -1480,11 +1467,11 @@ Dropzone.discover = function() {
       }
     }
     return _results;
-};
+  };
 
-Dropzone.blacklistedBrowsers = [/opera.*Macintosh.*version\/12/i];
+  Dropzone.blacklistedBrowsers = [/opera.*Macintosh.*version\/12/i];
 
-Dropzone.isBrowserSupported = function() {
+  Dropzone.isBrowserSupported = function() {
     var capableBrowser, regex, _i, _len, _ref;
     capableBrowser = true;
     if (window.File && window.FileReader && window.FileList && window.Blob && window.FormData && document.querySelector) {
@@ -1504,9 +1491,9 @@ Dropzone.isBrowserSupported = function() {
       capableBrowser = false;
     }
     return capableBrowser;
-};
+  };
 
-without = function(list, rejectedItem) {
+  without = function(list, rejectedItem) {
     var item, _i, _len, _results;
     _results = [];
     for (_i = 0, _len = list.length; _i < _len; _i++) {
@@ -1516,22 +1503,22 @@ without = function(list, rejectedItem) {
       }
     }
     return _results;
-};
+  };
 
-camelize = function(str) {
+  camelize = function(str) {
     return str.replace(/[\-_](\w)/g, function(match) {
       return match.charAt(1).toUpperCase();
     });
-};
+  };
 
-Dropzone.createElement = function(string) {
+  Dropzone.createElement = function(string) {
     var div;
     div = document.createElement("div");
     div.innerHTML = string;
     return div.childNodes[0];
-};
+  };
 
-Dropzone.elementInside = function(element, container) {
+  Dropzone.elementInside = function(element, container) {
     if (element === container) {
       return true;
     }
@@ -1541,9 +1528,9 @@ Dropzone.elementInside = function(element, container) {
       }
     }
     return false;
-};
+  };
 
-Dropzone.getElement = function(el, name) {
+  Dropzone.getElement = function(el, name) {
     var element;
     if (typeof el === "string") {
       element = document.querySelector(el);
@@ -1554,9 +1541,9 @@ Dropzone.getElement = function(el, name) {
       throw new Error("Invalid `" + name + "` option provided. Please provide a CSS selector or a plain HTML element.");
     }
     return element;
-};
+  };
 
-Dropzone.getElements = function(els, name) {
+  Dropzone.getElements = function(els, name) {
     var e, el, elements, _i, _j, _len, _len1, _ref;
     if (els instanceof Array) {
       elements = [];
@@ -1583,17 +1570,17 @@ Dropzone.getElements = function(els, name) {
       throw new Error("Invalid `" + name + "` option provided. Please provide a CSS selector, a plain HTML element or a list of those.");
     }
     return elements;
-};
+  };
 
-Dropzone.confirm = function(question, accepted, rejected) {
+  Dropzone.confirm = function(question, accepted, rejected) {
     if (window.confirm(question)) {
       return accepted();
     } else if (rejected != null) {
       return rejected();
     }
-};
+  };
 
-Dropzone.isValidFile = function(file, acceptedFiles) {
+  Dropzone.isValidFile = function(file, acceptedFiles) {
     var baseMimeType, mimeType, validType, _i, _len;
     if (!acceptedFiles) {
       return true;
@@ -1619,47 +1606,47 @@ Dropzone.isValidFile = function(file, acceptedFiles) {
       }
     }
     return false;
-};
+  };
 
-if (typeof jQuery !== "undefined" && jQuery !== null) {
+  if (typeof jQuery !== "undefined" && jQuery !== null) {
     jQuery.fn.dropzone = function(options) {
       return this.each(function() {
         return new Dropzone(this, options);
       });
     };
-}
+  }
 
-if (typeof module !== "undefined" && module !== null) {
+  if (typeof module !== "undefined" && module !== null) {
     module.exports = Dropzone;
-} else {
+  } else {
     window.Dropzone = Dropzone;
-}
+  }
 
-Dropzone.ADDED = "added";
+  Dropzone.ADDED = "added";
 
-Dropzone.QUEUED = "queued";
+  Dropzone.QUEUED = "queued";
 
-Dropzone.ACCEPTED = Dropzone.QUEUED;
+  Dropzone.ACCEPTED = Dropzone.QUEUED;
 
-Dropzone.UPLOADING = "uploading";
+  Dropzone.UPLOADING = "uploading";
 
-Dropzone.PROCESSING = Dropzone.UPLOADING;
+  Dropzone.PROCESSING = Dropzone.UPLOADING;
 
-Dropzone.CANCELED = "canceled";
+  Dropzone.CANCELED = "canceled";
 
-Dropzone.ERROR = "error";
+  Dropzone.ERROR = "error";
 
-Dropzone.SUCCESS = "success";
+  Dropzone.SUCCESS = "success";
 
 
-/*
+  /*
   
-Bugfix for iOS 6 and 7
+  Bugfix for iOS 6 and 7
-Source: http://stackoverflow.com/questions/11929099/html5-canvas-drawimage-ratio-bug-ios
+  Source: http://stackoverflow.com/questions/11929099/html5-canvas-drawimage-ratio-bug-ios
-based on the work of https://github.com/stomita/ios-imagefile-megapixel
+  based on the work of https://github.com/stomita/ios-imagefile-megapixel
    */
 
-detectVerticalSquash = function(img) {
+  detectVerticalSquash = function(img) {
     var alpha, canvas, ctx, data, ey, ih, iw, py, ratio, sy;
     iw = img.naturalWidth;
     ih = img.naturalHeight;
@@ -1687,16 +1674,16 @@ detectVerticalSquash = function(img) {
     } else {
       return ratio;
     }
-};
+  };
 
-drawImageIOSFix = function(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh) {
+  drawImageIOSFix = function(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh) {
     var vertSquashRatio;
     vertSquashRatio = detectVerticalSquash(img);
     return ctx.drawImage(img, sx, sy, sw, sh, dx, dy, dw, dh / vertSquashRatio);
-};
+  };
 
 
-/*
+  /*
    * contentloaded.js
    *
    * Author: Diego Perini (diego.perini at gmail.com)
@@ -1710,7 +1697,7 @@ drawImageIOSFix = function(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh) {
    * http://javascript.nwbox.com/ContentLoaded/MIT-LICENSE
    */
 
-contentLoaded = function(win, fn) {
+  contentLoaded = function(win, fn) {
     var add, doc, done, init, poll, pre, rem, root, top;
     done = false;
     top = true;
@@ -1752,12 +1739,14 @@ contentLoaded = function(win, fn) {
       doc[add](pre + "readystatechange", init, false);
       return win[add](pre + "load", init, false);
     }
-};
+  };
 
-Dropzone._autoDiscoverFunction = function() {
+  Dropzone._autoDiscoverFunction = function() {
     if (Dropzone.autoDiscover) {
       return Dropzone.discover();
     }
-};
+  };
 
-contentLoaded(window, Dropzone._autoDiscoverFunction);
+  contentLoaded(window, Dropzone._autoDiscoverFunction);
+
+}).call(this);

modules/files/site/files/js/src/basic.scss

@@ -1,78 +0,0 @@
-/*
- * The MIT License
- * Copyright (c) 2012 Matias Meno <m@tias.me>
- */
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-.dropzone, .dropzone * {
-  box-sizing: border-box;
-}
-.dropzone {
-
-  position: relative;
-
-  .dz-preview {
-    position: relative;
-    display: inline-block;
-    width: 120px;
-    margin: 0.5em;
-
-    .dz-progress {
-      display: block;
-      height: 15px;
-      border: 1px solid #aaa;
-      .dz-upload {
-        display: block;
-        height: 100%;
-        width: 0;
-        background: green;
-      }
-    }
-
-    .dz-error-message {
-      color: red;
-      display: none;
-    }
-    &.dz-error {
-      .dz-error-message, .dz-error-mark {
-        display: block;
-      }
-    }
-    &.dz-success {
-      .dz-success-mark {
-        display: block;
-      }
-    }
-
-    .dz-error-mark, .dz-success-mark {
-      position: absolute;
-      display: none;
-      left: 30px;
-      top: 30px;
-      width: 54px;
-      height: 58px;
-      left: 50%;
-      margin-left: -(54px/2);
-    }
-
-
-  }
-
-}

modules/files/site/files/js/src/dropzone.scss

@@ -1,413 +0,0 @@
-/*
- * The MIT License
- * Copyright (c) 2012 Matias Meno <m@tias.me>
- */
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-@mixin keyframes($name) {
-  @-webkit-keyframes #{$name} {
-    @content; 
-  }
-  @-moz-keyframes #{$name} {
-    @content;
-  }
-  @keyframes #{$name} {
-    @content;
-  } 
-}
-
-
-@mixin prefix($map, $vendors: webkit moz ms o) {
-  @each $prop, $value in $map {
-    @if $vendors {
-      @each $vendor in $vendors {
-        #{"-" + $vendor + "-" + $prop}: #{$value};
-      }
-    }
-    // Dump regular property anyway
-    #{$prop}: #{$value};
-  }
-}
-
-
-@include keyframes(passing-through) {
-  
-  0% {
-    opacity: 0;
-    @include prefix((transform: translateY(40px)));
-  }
-
-  30%, 70% {
-    opacity: 1;
-    @include prefix((transform: translateY(0px)));
-  }
-
-  100% {
-    opacity: 0;
-    @include prefix((transform: translateY(-40px)));
-  }
-}
-
-
-@include keyframes(slide-in) {
-  
-  0% {
-    opacity: 0;
-    @include prefix((transform: translateY(40px)));
-  }
-
-  30% {
-    opacity: 1;
-    @include prefix((transform: translateY(0px)));
-  }
-}
-
-
-
-@include keyframes(pulse) {
-  
-  0% { @include prefix((transform: scale(1))); }
-  10% { @include prefix((transform: scale(1.1))); }
-  20% { @include prefix((transform: scale(1))); }
-
-}
-
-
-
-.dropzone, .dropzone * {
-  box-sizing: border-box;
-}
-.dropzone {
-
-  $image-size: 120px;
-
-  $image-border-radius: 20px;
-
-  &.dz-clickable {
-    cursor: pointer;
-
-    * {
-      cursor: default;
-    }
-    .dz-message {
-      &, * {
-        cursor: pointer;
-      }
-    }
-  }
-
-  min-height: 150px;
-  border: 2px solid rgba(0, 0, 0, 0.3);
-  background: white;
-  padding: 20px 20px;
-
-  &.dz-started {
-    .dz-message {
-      display: none;
-    }
-  }
-
-  &.dz-drag-hover {
-    border-style: solid;
-    .dz-message {
-      opacity: 0.5;
-    }
-  }
-  .dz-message {
-    text-align: center;
-    margin: 2em 0;
-
-
-  }
-
-
-
-  .dz-preview {
-    position: relative;
-    display: inline-block;
-
-    vertical-align: top;
-
-    margin: 16px;
-    min-height: 100px;
-
-    &:hover {
-      // Making sure that always the hovered preview element is on top
-      z-index: 1000;
-      .dz-details {
-        opacity: 1;
-      }
-    }
-
-    &.dz-file-preview {
-
-      .dz-image {
-        border-radius: $image-border-radius;
-        background: #999;
-        background: linear-gradient(to bottom, #eee, #ddd);
-      }
-
-      .dz-details {
-        opacity: 1;
-      }
-    }
-
-    &.dz-image-preview {
-      background: white;
-      .dz-details {
-        @include prefix((transition: opacity 0.2s linear));
-      }
-    }
-
-    .dz-remove {
-      font-size: 14px;
-      text-align: center;
-      display: block;
-      cursor: pointer;
-      border: none;
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-
-    &:hover .dz-details {
-      opacity: 1;
-    }
-    .dz-details {
-      $background-color: #444;
-
-      z-index: 20;
-
-      position: absolute;
-      top: 0;
-      left: 0;
-
-      opacity: 0;
-
-      font-size: 13px;
-      min-width: 100%;
-      max-width: 100%;
-      padding: 2em 1em;
-      text-align: center;
-      color: rgba(0, 0, 0, 0.9);
-
-      $width: 120px;
-
-      line-height: 150%;
-
-      .dz-size {
-        margin-bottom: 1em;
-        font-size: 16px;
-      }
-
-      .dz-filename {
-
-        white-space: nowrap;
-
-        &:hover {
-          span {
-            border: 1px solid rgba(200, 200, 200, 0.8);
-            background-color: rgba(255, 255, 255, 0.8);
-          }
-        }
-        &:not(:hover) {
-          span {
-            border: 1px solid transparent;
-          }
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-      }
-
-      .dz-filename, .dz-size {
-        span {
-          background-color: rgba(255, 255, 255, 0.4);
-          padding: 0 0.4em;
-          border-radius: 3px;
-        }
-      }
-
-    }
-
-    &:hover {
-      .dz-image {
-        // opacity: 0.8;
-        img {
-          @include prefix((transform: scale(1.05, 1.05))); // Getting rid of that white bleed-in
-          @include prefix((filter: blur(8px)), webkit); // Getting rid of that white bleed-in
-        }
-      }
-    }
-    .dz-image {
-      border-radius: $image-border-radius;
-      overflow: hidden;
-      width: $image-size;
-      height: $image-size;
-      position: relative;
-      display: block;
-      z-index: 10;
-
-      img {
-        display: block;
-      }
-    }
-
-
-    &.dz-success {
-      .dz-success-mark {
-        @include prefix((animation: passing-through 3s cubic-bezier(0.770, 0.000, 0.175, 1.000)));
-      }
-    }
-    &.dz-error {
-      .dz-error-mark {
-        opacity: 1;
-        @include prefix((animation: slide-in 3s cubic-bezier(0.770, 0.000, 0.175, 1.000)));
-      }
-    }
-
-
-    .dz-success-mark, .dz-error-mark {
-
-      $image-height: 54px;
-      $image-width: 54px;
-
-      pointer-events: none;
-
-      opacity: 0;
-      z-index: 500;
-
-      position: absolute;
-      display: block;
-      top: 50%;
-      left: 50%;
-      margin-left: -($image-width/2);
-      margin-top: -($image-height/2);
-
-      svg {
-        display: block;
-        width: $image-width;
-        height: $image-height;
-      }
-    }
-    
-      
-    &.dz-processing .dz-progress {
-      opacity: 1;
-      @include prefix((transition: all 0.2s linear));
-    }
-    &.dz-complete .dz-progress {
-      opacity: 0;
-      @include prefix((transition: opacity 0.4s ease-in));
-    }
-
-    &:not(.dz-processing) {
-      .dz-progress {
-        @include prefix((animation: pulse 6s ease infinite));
-      }
-    }
-    .dz-progress {
-
-      opacity: 1;
-      z-index: 1000;
-
-      pointer-events: none;
-      position: absolute;
-      height: 16px;
-      left: 50%;
-      top: 50%;
-      margin-top: -8px;
-
-      width: 80px;
-      margin-left: -40px;
-
-      // border: 2px solid #333;
-      background: rgba(255, 255, 255, 0.9);
-
-      // Fix for chrome bug: https://code.google.com/p/chromium/issues/detail?id=157218
-      -webkit-transform: scale(1);
-
-
-      border-radius: 8px;
-
-      overflow: hidden;
-
-      .dz-upload {
-        background: #333;
-        background: linear-gradient(to bottom, #666, #444);
-        position: absolute;
-        top: 0;
-        left: 0;
-        bottom: 0;
-        width: 0;
-        @include prefix((transition: width 300ms ease-in-out));
-      }
-
-    }
-
-    &.dz-error {
-      .dz-error-message {
-        display: block;
-      }
-      &:hover .dz-error-message {
-        opacity: 1;
-        pointer-events: auto;
-      }
-    }
-
-    .dz-error-message {
-      $width: $image-size + 20px;
-      $color: rgb(190, 38, 38);
-
-      pointer-events: none;
-      z-index: 1000;
-      position: absolute;
-      display: block;
-      display: none;
-      opacity: 0;
-      @include prefix((transition: opacity 0.3s ease));
-      border-radius: 8px;
-      font-size: 13px;
-      top: $image-size + 10px;
-      left: -10px;
-      width: $width;
-      background: $color;
-      background: linear-gradient(to bottom, $color, darken($color, 5%));
-      padding: 0.5em 1.2em;
-      color: white;
-
-      // The triangle pointing up
-      &:after {
-        content: '';
-        position: absolute;
-        top: -6px;
-        left: $width / 2 - 6px;
-        width: 0; 
-        height: 0; 
-        border-left: 6px solid transparent;
-        border-right: 6px solid transparent;
-        border-bottom: 6px solid $color;
-      }
-    }
-
-  }
-}
-
-

modules/files/site/files/scss/files.scss

@@ -1,16 +1,18 @@
 .uploaded-files {
-	table {
 	width: 100%;
 	border-collapse: collapse;
 	border: 1px solid black;
 
 	th {
-			padding: 3px 0 3px 5px;
+	  padding-left: 5px;
+	  padding-top: 3px;
+	  padding-bottom: 3px;
 	}
 
 	td {
-			padding: 3px 0 3px 5px;
+	  padding-left: 5px;
-		}
+	  padding-top: 3px;
+	  padding-bottom: 3px;
 	}
 
 	a.button{
@@ -18,33 +20,23 @@
 		text-decoration: none;
 		border: solid 1px #999;
 		background-color: #ddd;
-		padding: 2px 4px 2px 4px;
 		&:hover {
 			color: black;
-			border: solid 1px #06f;
+			text-decoration: none;
-			background-color: #cff;
 		}
 	}
 }
 
 .upload-files {
-	.center {
+	a.upload-button{
-		text-align: center;
-		padding: 10px;
-	}
-	a.button{
 		margin: auto;
 		width: 100px;
-
 		color: black;
 		text-decoration: none;
-		border: solid 1px #999;
+
-		background-color: #ddd;
-		padding: 2px 4px 2px 4px;
 		&:hover {
 			color: black;
-			border: solid 1px #06f;
+			text-decoration: none;
-			background-color: #cff;
 		}
 	}
 }
@@ -59,5 +51,23 @@
 	text-align: center;
 	padding-top: 15px;
 	padding-bottom: 15px;
-}
 
+	.dz-message {
+	  cursor: pointer;
+	}
+
+
+	.dz-preview, .dz-file-preview, .dz-processing, .dz-success,
+	.dz-image-preview, .dz-complete {
+	  padding: 10px;
+	  margin: 10px;
+	  width: auto;
+	  display: inline-block;
+	}
+
+	.dz-preview {
+	  border: 1px solid black;
+	  border-radius: 5px;
+	  background: #e6e6e6;
+	}
+}

modules/google_search/src/google_custom_search_module.e

@@ -114,7 +114,7 @@ feature -- Handler
 						attached l_search.last_result as l_result and then
 					    l_result.status = 200
 					then
-						if attached template_block (Current, "search", api) as l_tpl_block then
+						if attached template_block (Current, "search", r) as l_tpl_block then
 							l_tpl_block.set_value (l_result, "result")
 							r.add_block (l_tpl_block, "content")
 						end

modules/oauth20/cms_oauth_20_module.e

@@ -243,7 +243,7 @@ feature -- Hooks
 				a_response.location.same_string ("account")
 			then
 				if
-					attached template_block (Current, "account_info", a_response.api) as l_tpl_block and then
+					attached template_block ("account_info", a_response) as l_tpl_block and then
 					attached a_response.user as l_user
 				then
 					associate_account (l_user, a_response.values)
@@ -323,7 +323,7 @@ feature {NONE} -- Block views
 		local
 			vals: CMS_VALUE_TABLE
 		do
-			if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+			if attached template_block (a_block_id, a_response) as l_tpl_block then
 				create vals.make (1)
 					-- add the variable to the block
 				a_response.api.hooks.invoke_value_table_alter (vals, a_response)

modules/openid/cms_openid_module.e

@@ -270,7 +270,7 @@ feature {NONE} -- Block views
 		local
 			vals: CMS_VALUE_TABLE
 		do
-			if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+			if attached template_block (a_block_id, a_response) as l_tpl_block then
 				create vals.make (1)
 					-- add the variable to the block
 				a_response.api.hooks.invoke_value_table_alter (vals, a_response)

modules/session_auth/cms_session_auth_module.e

@@ -141,7 +141,7 @@ feature {NONE} -- Implementation: routes
 			if api.user_is_authenticated then
 				r.add_error_message ("You are already signed in!")
 			else
-				if attached template_block (Current, "login", api) as l_tpl_block then
+				if attached template_block ("login", r) as l_tpl_block then
 					create vals.make (1)
 						-- add the variable to the block
 					l_tpl_block.set_value (api.user, "user")
@@ -223,7 +223,7 @@ feature {NONE} -- Implementation: routes
 					end
 				else
 					create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
-					if attached template_block (Current, "login", api) as l_tpl_block then
+					if attached template_block ("login", r) as l_tpl_block then
 						l_tpl_block.set_value (l_username.value, "username")
 						l_tpl_block.set_value ("Wrong: Username or password ", "error")
 						r.add_block (l_tpl_block, "content")
@@ -232,7 +232,7 @@ feature {NONE} -- Implementation: routes
 				r.execute
 			else
 				create {BAD_REQUEST_ERROR_CMS_RESPONSE} r.make (req, res, api)
-				if attached template_block (Current, "login", api) as l_tpl_block then
+				if attached template_block ("login", r) as l_tpl_block then
 					if attached {WSF_STRING} req.form_parameter ("username") as l_username then
 						l_tpl_block.set_value (l_username.value, "username")
 					end
@@ -272,7 +272,7 @@ feature {NONE} -- Block views
 		local
 			vals: CMS_VALUE_TABLE
 		do
-			if attached template_block (Current, a_block_id, a_response.api) as l_tpl_block then
+			if attached template_block (a_block_id, a_response) as l_tpl_block then
 				create vals.make (1)
 					-- add the variable to the block
 				a_response.api.hooks.invoke_value_table_alter (vals, a_response)

modules/taxonomy/cms_taxonomy_module.e

@@ -187,7 +187,7 @@ feature -- Hooks
 				 -- Add the link to the taxonomy to the main menu
 			if a_response.has_permission ("admin taxonomy") then
 				create lnk.make ("Taxonomy", "admin/taxonomy/")
-				a_menu_system.management_menu.extend_into (lnk, "Admin", "admin")
+				a_menu_system.management_menu.extend (lnk)
 			end
 		end
 

src/hooks/cms_hook_block.e

@@ -26,6 +26,6 @@ feature -- Hook
 		end
 
 note
-	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

src/hooks/cms_hook_block_helper.e

@@ -6,17 +6,17 @@ note
 deferred class
 	CMS_HOOK_BLOCK_HELPER
 
-feature {NONE} -- Factory	
+feature -- Factory	
 
-	template_block (a_module: CMS_MODULE; a_block_id: READABLE_STRING_8; a_cms_api: CMS_API): detachable CMS_SMARTY_TEMPLATE_BLOCK
+	template_block (a_module: CMS_MODULE; a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE): detachable CMS_SMARTY_TEMPLATE_BLOCK
-			-- Smarty content block for `a_block_id' in the context of `a_module' and `a_cms_api'.
+			-- Smarty content block for `a_block_id' in the context of `a_module' and `a_response'.
 		local
 			res: PATH
 			p: detachable PATH
 		do
 			create res.make_from_string ("templates")
 			res := res.extended ("block_").appended (a_block_id).appended_with_extension ("tpl")
-			p := a_cms_api.module_theme_resource_location (a_module, res)
+			p := a_response.api.module_theme_resource_location (a_module, res)
 			if p /= Void then
 				if attached p.entry as e then
 					create Result.make (a_block_id, Void, p.parent, e)
@@ -26,20 +26,6 @@ feature {NONE} -- Factory
 			end
 		end
 
-	template_block_with_values (a_module: CMS_MODULE; a_block_id: READABLE_STRING_8; a_cms_api: CMS_API; a_values: STRING_TABLE [ANY]): like template_block
-			-- Smarty content block for `a_block_id' in the context of `a_module' and `a_cms_api',
-			-- With additional `a_values'.
-		do
-			Result := template_block (a_module, a_block_id, a_cms_api)
-			if Result /= Void then
-				across
-					a_values as ic
-				loop
-					Result.set_value (ic.item, ic.key)
-				end
-			end
-		end
-
 note
 	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"

src/kernel/form/cms_editor.e

@@ -9,31 +9,31 @@ deferred class
 
 feature -- Initialisation
 
-	load_assets: STRING
+	load_assets : STRING
-			-- Loads all assest needed to show the editor.
+			-- Loads all assest needed to show the editor
 		deferred
 		end
 
 feature -- Javascript
 
-	javascript_replace_textarea (a_textarea: WSF_FORM_TEXTAREA): STRING
+	javascript_replace_textarea (a_textarea : WSF_FORM_TEXTAREA): STRING
-			-- Javascript code that replaces a textarea with the editor. The editor instance should be saved in editor_variable.
+			-- Javascript code that replaces a textarea with the editor. The editor instance should be saved in editor_variable
 		deferred
 		end
 
-	javascript_restore_textarea (a_textarea: WSF_FORM_TEXTAREA): STRING
+	javascript_restore_textarea (a_textarea : WSF_FORM_TEXTAREA): STRING
 			-- Javascript code that restores a textarea
 		deferred
 		end
 
-	javascript_textarea_to_editor (a_textarea: WSF_FORM_TEXTAREA): STRING
+	javascript_textarea_to_editor (a_textarea : WSF_FORM_TEXTAREA): STRING
-			-- Javascript code to display the textarea as a WYSIWIG editor as soon as the document is loaded.
+			-- Javascript code to display the textarea as a WYSIWIG editor as soon as the document is loaded
 		do
 			Result := javascript_ready (javascript_replace_textarea (a_textarea))
 		end
 
-	javascript_textarea_to_editor_if_selected (a_textarea: WSF_FORM_TEXTAREA; a_select_field: WSF_FORM_SELECT; a_value: STRING): STRING
+	javascript_textarea_to_editor_if_selected (a_textarea: WSF_FORM_TEXTAREA; a_select_field : WSF_FORM_SELECT; a_value : STRING) : STRING
-			-- Javascript code to display the textarea as a WYSIWIG editor if a_select_field has a_value,
+			-- Javascript code to display the textarea as a WYSIWIG editor if a_select_field has a_value
 		local
 			initial_replace_code, on_select_replace_code: STRING
 		do
@@ -55,41 +55,39 @@ feature -- Javascript
 			Result := initial_replace_code + " " + on_select_replace_code
 		end
 
-	javascript_init_editor_variable (a_textarea: WSF_FORM_TEXTAREA): STRING
+	javascript_init_editor_variable (a_textarea : WSF_FORM_TEXTAREA) : STRING
-			-- Returns the javascript code that initializes a local variable to store the editor instance.
+			-- Returns the javascript code that initializes a local variable to store the editor instance
 		do
 			Result := "var " + editor_variable (a_textarea) + "; "
 		end
 
-	javascript_if_selected (a_select_field: WSF_FORM_SELECT; a_value: STRING; a_code: STRING): STRING
+	javascript_if_selected (a_select_field : WSF_FORM_SELECT; a_value : STRING; a_code : STRING) : STRING
-			-- Javascript that executes a_code if a_value is selected at a_select_field.
+			-- Javascript that executes a_code if a_value is selected at a_select_field
 		do
 			Result := "if($('#" + field_id (a_select_field) + "').val() == %"" + a_value + "%"){ " + a_code + " }"
 		end
 
-	javascript_ready (a_code: STRING): STRING
+	javascript_ready (a_code : STRING) : STRING
-			-- Wraps the given javascript code with a ready statement,
+			-- Wraps the given javascript code with a ready statement, such that it's executed when the document has loaded
-			-- such that it's executed when the document has loaded.
 		do
 			Result := "$(function() { " + a_code + " });"
 		end
 
-	javascript_on_select (a_select_field: WSF_FORM_SELECT; a_value: STRING; a_then: STRING; a_else: STRING): STRING
+	javascript_on_select (a_select_field : WSF_FORM_SELECT; a_value : STRING; a_then : STRING; a_else : STRING) : STRING
-			-- Javascript code that executes `a_then' if at the given `a_select_field'
+			-- Javascript code that executes a_then if at the given select_field the given string value is selected, otherwise it executes a_else
-			-- the given string `a_value' is selected, otherwise it executes `a_else'.
 		do
-			Result := "$('#" + field_id (a_select_field) + "').change(function(){"
+			Result := "$('#" + field_id (a_select_field) + "').change(function(){" +
-				+		javascript_if_selected (a_select_field, a_value, a_then)
+					javascript_if_selected (a_select_field, a_value, a_then) +
-				+ 	"else{"
+				"else{" +
-				+		a_else
+					a_else +
-				+ 	"}"
+				"}" +
-				+ "});"
+			"});"
 		end
 
 feature -- Helper
 
-	field_id (a_select_field: WSF_FORM_SELECT): STRING
+	field_id(a_select_field : WSF_FORM_SELECT) : STRING
-			-- Id of the given field.
+			-- Returns the id of the given field
 		do
 			if attached a_select_field.css_id  as a_id then
 				Result := a_id
@@ -98,13 +96,13 @@ feature -- Helper
 			end
 		end
 
-	editor_variable (a_textarea: WSF_FORM_TEXTAREA): STRING
+	editor_variable (a_textarea : WSF_FORM_TEXTAREA) : STRING
 			-- Returns the variable name that stores the editor instance of the given textarea
 		do
 			Result := "cms_ckeditor_" + a_textarea.name
 		end
 
 note
-	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

src/kernel/form/cms_editor_ckeditor.e

@@ -12,7 +12,7 @@ inherit
 
 feature -- Initialisation
 
-	load_assets: STRING
+	load_assets : STRING
 			-- <Precursor>
 		do
 			Result := "<script src=%"//cdn.ckeditor.com/4.4.7/standard/ckeditor.js%"></script>"
@@ -20,25 +20,23 @@ feature -- Initialisation
 
 feature -- Javascript
 
-	javascript_replace_textarea (a_textarea: WSF_FORM_TEXTAREA): STRING
+	javascript_replace_textarea (a_textarea : WSF_FORM_TEXTAREA) : STRING
 			-- <Precursor>
 		do
-				-- Replaces the textarea with an editor instance.
+				-- Replaces the textarea with an editor instance. Save the instance in a variable
-				-- Save the instance in a variable.
 			Result := "$(%"textarea[name="+ a_textarea.name +"]%").each(function() {"
 			Result.append (editor_variable (a_textarea) + " = CKEDITOR.replace(this);")
 			Result.append ("});")
 		end
 
-	javascript_restore_textarea (a_textarea: WSF_FORM_TEXTAREA): STRING
+	javascript_restore_textarea (a_textarea : WSF_FORM_TEXTAREA) : STRING
 			-- <Precursor>
 		do
-				-- Replaces the textarea with an editor instance.
+				-- Replaces the textarea with an editor instance. Save the instance in a variable
-				-- Save the instance in a variable.
 			Result := "if (" + editor_variable (a_textarea) + " != undefined) " + editor_variable (a_textarea) + ".destroy();"
 		end
 
 note
-	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

src/service/response/cms_response.e

@@ -282,9 +282,7 @@ feature -- Head customization
 		local
 			s: STRING_8
 		do
-			create s.make_from_string ("<link rel=%"stylesheet%" href=%"")
+			s := "<link rel=%"stylesheet%" href=%""+ a_href + "%" type=%"text/css%""
-			s.append (a_href)
-			s.append ("%" type=%"text/css%"")
 			if a_media /= Void then
 				s.append (" media=%""+ a_media + "%"")
 			end
@@ -292,24 +290,11 @@ feature -- Head customization
 			add_additional_head_line (s, False)
 		end
 
-	add_style_content (a_style_content: STRING)
-			-- Add style content `a_style_content' in the head, using <style> tag.
-		local
-			s: STRING_8
-		do
-			create s.make_from_string ("<style>%N")
-			s.append (a_style_content)
-			s.append ("%N</style>")
-			add_additional_head_line (s, True)
-		end
-
 	add_javascript_url (a_src: STRING)
 		local
 			s: STRING_8
 		do
-			create s.make_from_string ("<script type=%"text/javascript%" src=%"")
+			s := "<script type=%"text/javascript%" src=%"" + a_src + "%"></script>"
-			s.append (a_src)
-			s.append ("%"></script>")
 			add_additional_head_line (s, False)
 		end
 
@@ -317,9 +302,7 @@ feature -- Head customization
 		local
 			s: STRING_8
 		do
-			create s.make_from_string ("<script type=%"text/javascript%">%N")
+			s := "<script type=%"text/javascript%">%N" + a_script + "%N</script>"
-			s.append (a_script)
-			s.append ("%N</script>")
 			add_additional_head_line (s, True)
 		end
 

src/theme/cms_html_page.e

@@ -144,17 +144,12 @@ feature -- Element change
 			title := s
 		end
 
-	add_additional_head_line (s: READABLE_STRING_8)
-		do
-			head_lines.extend (s)
-		end
-
 	add_meta_name_content (a_name: STRING; a_content: STRING)
 		local
 			s: STRING_8
 		do
 			s := "<meta name=%"" + a_name + "%" content=%"" + a_content + "%" />"
-			add_additional_head_line (s)
+			head_lines.extend (s)
 		end
 
 	add_meta_http_equiv (a_http_equiv: STRING; a_content: STRING)
@@ -162,56 +157,39 @@ feature -- Element change
 			s: STRING_8
 		do
 			s := "<meta http-equiv=%"" + a_http_equiv + "%" content=%"" + a_content + "%" />"
-			add_additional_head_line (s)
+			head_lines.extend (s)
 		end
 
 	add_style (a_href: STRING; a_media: detachable STRING)
 		local
 			s: STRING_8
 		do
-			create s.make_from_string ("<link rel=%"stylesheet%" href=%"")
+			s := "<link rel=%"stylesheet%" href=%""+ a_href + "%" type=%"text/css%""
-			s.append (a_href)
-			s.append ("%" type=%"text/css%"")
 			if a_media /= Void then
 				s.append (" media=%""+ a_media + "%"")
 			end
 			s.append ("/>")
-			add_additional_head_line (s)
+			head_lines.extend (s)
-		end
-
-	add_style_content (a_style_content: STRING)
-			-- Add style content `a_style_content' in the head, using <style> tag.
-		local
-			s: STRING_8
-		do
-			create s.make_from_string ("<style>%N")
-			s.append (a_style_content)
-			s.append ("%N</style>")
-			add_additional_head_line (s)
 		end
 
 	add_javascript_url (a_src: STRING)
 		local
 			s: STRING_8
 		do
-			create s.make_from_string ("<script type=%"text/javascript%" src=%"")
+			s := "<script type=%"text/javascript%" src=%"" + a_src + "%"></script>"
-			s.append (a_src)
+			head_lines.extend (s)
-			s.append ("%"></script>")
-			add_additional_head_line (s)
 		end
 
 	add_javascript_content (a_script: STRING)
 		local
 			s: STRING_8
 		do
-			create s.make_from_string ("<script type=%"text/javascript%">%N")
+			s := "<script type=%"text/javascript%">%N" + a_script + "%N</script>"
-			s.append (a_script)
+			head_lines.extend (s)
-			s.append ("%N</script>")
-			add_additional_head_line (s)
 		end
 
 note
-	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

tools/roc.bat

@@ -30,7 +30,7 @@ set ROC_TOOL_PATH=%~dp0
 goto START
 
 :START
-rem echo Calling %ROC_TOOL_PATH%roc.exe %*
+echo Calling %ROC_TOOL_PATH%roc.exe %*
 call %ROC_TOOL_PATH%roc.exe %*
 goto END