mokio 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb750d5108ef7534ebd2dcfb19961ef0dfdb48a
-  data.tar.gz: 7400730e89ba35584e9822a1a929c49b2ffc789b
+  metadata.gz: 09c90826bb94fa451fe98eace948db1b46db4262
+  data.tar.gz: 0f2d68ec3ae08377db3038691fff9ad471ccf88e
 SHA512:
-  metadata.gz: 40eea7d2849cbe23427d3cb35e6482a02d122ddc7f2015602aafd41282aaf15859f19f5fb6378d63740381afa6c3541d20df7a200572843232e5089779f60b3c
-  data.tar.gz: 22ae3daf75bb14ed965be75e409103c95e57378f995aee35c010ccaf5de026d2187075484fcc6a79f65b56cc513883e755da6173a100b9050dfef35ea37b8922
+  metadata.gz: 66e987c5632e64b51278956c4fcffbba887f553ebad9339ce9b157eb0413a158c7fec02bf7f4dc869ee8b3012a75f2d433a4059ebd5c7832c831f6f3514d855d
+  data.tar.gz: f557d9d6a09d6767cb84a3b3a675de23192377486c8ce4be27888cb1bf26b8773665945f09d7dc69b3e9e9e173dcf014c9f15dfbb6af3a07a9fef3bdde02ab63

data/README.rdoc

@@ -1,3 +1,33 @@
 = Mokio
 
-This project rocks and uses GNU AGPLv3. (http://www.gnu.org/licenses/agpl-3.0.html)
+== Licence
+
+GNU AGPLv3: http://www.gnu.org/licenses/agpl-3.0.html
+
+== Description
+
+    Mokio is a Content Management System that allows creation of
+    sophisticated websites. It consists maily of administration panel for your
+    desired website.
+    It provides the following types of content: Article (piece of text with
+    pictures, lists, links, etc.), Picture Gallery (easily managed article with
+    a number of photos - thumbs and edition provided), Movie Gallery
+    (article with links to Dailymotion, Vimeo and Youtube movies - thumbs
+    and edition provided), Contact Page with Google map and contact form.
+
+    Apart from content it is possible to manage menu structure of your
+    website for each language and defined position (part of the screen).
+
+    If this is not enough for what you need, you can also include pieces of
+    HTML code that should be shared by some (or all) subpages - called
+    HTML Blocks. You can define on which part of the page, these blocks
+    should be displayed.
+    Mokio provides also administration panel for javascripts, languages
+    and backend users.
+
+    Beside Mokio itself, there are various gems dedicated for Mokio, that
+    extends its core functionality.
+
+== Tutorials, documentation & useful tips
+
+See http://www.mokio.org/support

data/app/assets/javascripts/backend/forms.js.erb

@@ -51,9 +51,6 @@ $(document).ready(function() {
   });
 
 
-  $('.mask-date').mask('99-99-9999').attr('data-format', "dd-MM-yyyy");
-  $('.mask-date').datetimepicker({dateFormat: 'dd-mm-yy'});
-  $(".mask-date").parent().append("<span class='add-on calendar'><span class='icomoon-icon-calendar'></span></span>'");
 
   $(".add-on.calendar").click(function(event) {
     /* Act on the event */

data/app/assets/javascripts/backend/main.js

@@ -314,7 +314,7 @@ $(document).on('ready page:load', function(){
 
 				$this.removeClass('hide');
 				$('.collapseBtn.leftbar').animate({
-						top: '150',
+						top: '125',
 						left: '200'
 					}, 500, 'easeInExpo', function() {
 					$(this).removeClass('shadow');
@@ -328,7 +328,7 @@ $(document).on('ready page:load', function(){
 				$('#sidebar').css('margin-left','-299'+'px');
 				$('.collapseBtn.leftbar').animate({ //use .hide() if you experience heavy animation :)
  				    left: '20',
-				    top: '112'
+				    top: '87'
 				  }, 500, 'easeInExpo', function() {
 					    // Animation complete.
 				  
@@ -458,10 +458,12 @@ $(document).on('ready page:load', function(){
 
 	//make custom redirect for search form in .heading
 	$('#searchform').submit(function() {
-		var sText = $('.top-search').val();
-		var sAction = $(this).attr('action');
-		var sUrl = sAction + '?q=' + sText;
-		$(location).attr('href',sUrl);
+        var sText = $('.top-search').val();
+        var sAction = $(this).attr('action');
+        if (! sAction == 'undefined') {
+            var sUrl = sAction + '?q=' + sText;
+            $(location).attr('href', sUrl);
+        }
 		return false;
 	});
 

data/app/assets/javascripts/backend/photo_gallery/{photoEditForm.js → photoEditForm.js.erb}

@@ -26,9 +26,9 @@ var PhotoEditForm = {
     //
     // create buttons
     //
-    $(".editwrapper").append('<span class="photo_exit icon32 icomoon-icon-cancel white"></span>')
-                     .append('<span class="photo_crop icon32 icomoon-icon-crop white"></span>')
-                     .append('<span class="photo_rotate icon32 icomoon-icon-redo white"></span>');
+    $(".editwrapper").append('<span class="photo_exit icon32 icomoon-icon-cancel white" title="<%= I18n.t('backend.thumb_exit') %>"></span>')
+                     .append('<span class="photo_crop icon32 icomoon-icon-crop white" title="<%= I18n.t('backend.thumb_crop') %>"></span>')
+                     .append('<span class="photo_rotate icon32 icomoon-icon-redo white" title="<%= I18n.t('backend.thumb_rotate') %>"></span>');
 
     $file_upload = document.getElementById('uploadthumb');
 
@@ -127,6 +127,7 @@ var PhotoEditForm = {
           marginLeft: '-' + Math.round(rx * coords.x) + 'px',
           marginTop: '-' + Math.round(ry * coords.y) + 'px'
         });
+
       } 
       //
       // remember coordinates
@@ -145,8 +146,8 @@ var PhotoEditForm = {
       if ( !$(this).hasClass('show') ) {
         $(this).addClass('show')
 
-        $(".editwrapper").append('<span class="photo_cut icon32 icomoon-icon-scissors-2 white"></span>')
-                         .append("<div class=\"preview\"><img id=\"preview-img\" src=\"" + $("#photo_edited").attr('src') + "\"</div>");
+        $(".editwrapper").append('<span class="photo_cut icon32 icomoon-icon-scissors-2 white" title="<%= I18n.t('backend.thumb_cuts') %>"></span>')
+                         .append('<div class="preview" style="position:static;margin:0px auto 0px auto;"><img id="preview-img" src="' + $("#photo_edited").attr('src') + '"</div>');
 
         $(".photo_cut").hide().fadeIn(500);
         $(".preview").hide().fadeIn(500);

data/app/assets/stylesheets/backend/custom.css.scss

@@ -55,16 +55,16 @@ button.uploader {
   overflow: auto;
 
   li {
-    width: 150px;
-    height: 150px;
+//    width: 150px;
+//    height: 150px;
     margin-left: 2px !important;
     margin-right: -3px !important;
     vertical-align: top;
     padding: 5px;
 
     img {
-      width: 140px;
-      height: 140px;
+//      width: 140px;
+//      height: 140px;
     }
 
     .dragable {
@@ -108,16 +108,16 @@ button.uploader {
   overflow: auto;
 
   li {
-    width: 318px;
-    height: 189px;
+//    width: 318px;
+//    height: 189px;
     margin-left: 2px !important;
     margin-right: -3px !important;
     vertical-align: top;
     padding: 5px;
 
     img {
-      width: 308px;
-      height: 173px;
+//      width: 308px;
+//      height: 173px;
     }
 
     .dragable {
@@ -167,7 +167,7 @@ input.btn[type="submit"] {
 
 #FlashInfo {
   width: 100%;
-  height: 100px;
+  height: 75px;
   position: fixed;
   background: black;
   opacity: $default-opacity;
@@ -176,7 +176,7 @@ input.btn[type="submit"] {
   #FlashMessage {
     color: #FFFFFF;
     font-size: 18px;
-    line-height: 100px;
+    line-height: 75px;
     margin: 0 50px;
     text-align: center;
   }
@@ -252,7 +252,7 @@ input.btn[type="submit"] {
     overflow-x: hidden;
 
     #loader {
-      background: url(backend/loaders/circular/044.gif) no-repeat scroll 0 0 rgba(0, 0, 0, 0);
+      background: image-url('backend/loaders/circular/044.gif') no-repeat scroll 0 0 rgba(0, 0, 0, 0);
       height: 20px;
       width: 20px;
       left: 48%;
@@ -455,7 +455,7 @@ input.btn[type="submit"] {
   }
 
   #loader {
-    background: url(backend/loaders/circular/044.gif) no-repeat scroll 0 0 rgba(0, 0, 0, 0);
+    background: image-url('backend/loaders/circular/044.gif') no-repeat scroll 0 0 rgba(0, 0, 0, 0);
     height: 30px;
     left: 49%;
     position: fixed;
@@ -481,7 +481,7 @@ input.btn[type="submit"] {
 }
 #modal_external_link {
   .loader {
-    background: url(backend/loaders/circular/044.gif) no-repeat scroll 0 0 rgba(0, 0, 0, 0);
+    background: image-url('backend/loaders/circular/044.gif') no-repeat scroll 0 0 rgba(0, 0, 0, 0);
     float: right;
     height: 20px;
     width: 20px;

data/app/assets/stylesheets/backend/icons.css.scss

@@ -140,6 +140,7 @@
 
 
 .icon12 {font-size:12px; width:12px; height:12px;}
+.icon14 {font-size:14px; width:14px; height:14px;}
 .icon16 {font-size:16px; width:16px; height:16px;}
 .icon24 {font-size:24px; width:24px; height:24px;}
 .icon32 {font-size:32px; width:32px; height:32px;}

data/app/assets/stylesheets/backend/main.css.scss

@@ -415,8 +415,13 @@ body, p {font-family: 'Open Sans', Helvetica, Arial, sans-serif;}
   }
 .form-row input, .form-row textarea, .form-row select {width: 100%;}
 .form-row .form-actions {padding-left:0;}
+.form-row .form-actions button, .form-row .form-actions a{margin-left:10px;}
 
 .form-row .row-fluid [class*="span"] {margin-left: 0;}
+.form-row .row-fluid select[id*="_menu_ids"] {
+  width: 100%;
+  height: 300px;
+}
 
 #content .form-row.row-fluid {margin-top:15px !important;}
 #content .form-row.row-fluid .row-fluid {margin-top:0;}
@@ -971,7 +976,7 @@ select {width: 150px;}
 ================================================== */
 #header {
   background:image-url('backend/patterns/header.png') repeat #fa243c;
-  height:100px;
+  height:75px;
   position: absolute;
   top:0;
   left:0;
@@ -998,7 +1003,7 @@ select {width: 150px;}
   .navbar-inner {
     min-height: 100px;
     padding-right: 0px;
-    padding-left: 20px;
+//    padding-left: 20px;
     -webkit-border-radius: 0px;
     -moz-border-radius: 0px;
     border-radius: 0px;
@@ -1006,9 +1011,9 @@ select {width: 150px;}
     border:none;
   }
   .navbar .brand {
-    padding: 15px 20px 8px;
-    margin-left: -20px;
-    margin-right: 55px;
+    padding: 7px 20px 8px;
+    margin-left: -40px;
+    margin-right: 30px;
     font-size: 30px;
     font-weight: 700;
     line-height: 45px;
@@ -1320,7 +1325,7 @@ select {width: 150px;}
   display: block;
 }
 .collapseBtn.leftbar {
-  top:150px;
+  top:125px;
   left:200px;
 }
 .collapseBtn.rightbar {
@@ -1379,9 +1384,9 @@ select {width: 150px;}
 
 /*Content for left sidebar only*/
 #content {
-  padding: 100px 25px 25px 25px;
+  padding: 75px 25px 25px 25px;
   margin-left: 242px;
-  padding-top: 100px;
+  padding-top: 75px;
   min-height: 100%;
 }
 
@@ -1425,7 +1430,7 @@ select {width: 150px;}
 }
 #sidebar {
   width: 240px;
-  padding-top: 100px;
+  padding-top: 75px;
   float: left;
   z-index: 1;
 }
@@ -1538,6 +1543,7 @@ select {width: 150px;}
   }
   .search form {
     margin-bottom: 0;
+    margin-right: -5px;
   }
   .search .top-search {
     width:75%;
@@ -1599,6 +1605,8 @@ select {width: 150px;}
        -o-transition: all .2s ease-in-out;
           transition: all .2s ease-in-out;
   }
+
+
   .mainnav li a:hover {
     text-decoration:none;
     background: #35404d;
@@ -1611,6 +1619,10 @@ select {width: 150px;}
   .mainnav li a.current span, {
     color: #ff4057;
   }
+
+  .mainnav li a:hover span, {
+    color: #ff4057;
+  }
   #sidebar-right .mainnav li a.current, #sidebar-right .mainnav li a.current:hover {
 
   }
@@ -1627,10 +1639,32 @@ select {width: 150px;}
     display: none;
     float: left;
     margin-top:0px;
+    margin-right:0;
   }
   .mainnav ul li .sub.expand {display: block;}
 
-    .mainnav ul li .sub li a{font-size: 12px; box-shadow:none; }
+    /* sub sidebar element with plus button */
+    .mainnav ul li .sub li a:first-child{
+      font-size: 12px;
+      box-shadow:none;
+      width: 172px;
+    }
+
+    /* sub sidebar element without plus button */
+    .mainnav ul li .sub li a:only-of-type{
+      width: 195px;
+    }
+
+    /* main sidebar element with plus button */
+    .mainnav ul li a:first-child:not(.hasUl){
+      width: 184px;
+    }
+
+    /* main sidebar element without plus button */
+    .mainnav ul li a:only-child{
+      width: 100% !important;
+    }
+
     .mainnav ul li .sub li a.current {
       color: #fff;
     }
@@ -1646,7 +1680,37 @@ select {width: 150px;}
     }
     .mainnav ul li .sub li {
       width:100%;
+      position: relative;
     }
+
+
+    /* main sidebar element plus button */
+    .mainnav ul li a:nth-child(2) {
+      width: 20px;
+      right: 28px;
+      position: absolute;
+      height: 20px;
+      background: none;
+    }
+
+    /* sub sidebar element plus button */
+    .mainnav ul li .sub li a:nth-child(2) {
+      width: 20px;
+      right: -3px;
+      position: absolute;
+      height: 20px;
+      background: none;
+    }
+    
+  .mainnav ul li .sub li a:nth-child(2) span {
+    width: 20px;
+    height:20px;
+    margin:0;
+    padding:0;
+  }
+
+
+
     .mainnav ul li .sub li:first-child a:hover {
 
     }
@@ -1654,7 +1718,7 @@ select {width: 150px;}
       border-bottom: none;
     }
     .mainnav ul li .sub a span[class*=" icon-"], .mainnav ul li .sub a span[class*=" brocco-icon-"],.mainnav ul li .sub a span[class*=" cut-icon-"],.mainnav ul li .sub a span[class*=" entypo-icon-"],.mainnav ul li .sub a span[class*=" icomoon-icon-"], .mainnav ul li .sub a span[class*=" minia-icon-"],.mainnav ul li .sub a span[class*=" iconic-icon-"],.mainnav ul li .sub a span[class*=" meteo-icon-"],.mainnav ul li .sub a span[class*=" silk-icon-"],.mainnav ul li .sub a span[class*=" typ-icon-"],.mainnav ul li .sub a span[class*=" wpzoom-"],.mainnav ul li .sub a span[class*=" eco-"] {
-      padding-left:25px;
+      padding-left:13px;
       padding-right:10px;
     }
       .mainnav ul li .sub li .sub a span[class*=" icon-"], .mainnav ul li .sub li .sub a span[class*=" brocco-icon-"], .mainnav ul li .sub li .sub a span[class*=" cut-icon-"], .mainnav ul li .sub li .sub a span[class*=" entypo-icon-"], .mainnav ul li .sub li .sub a span[class*=" icomoon-icon-"], .mainnav ul li .sub li .sub a span[class*=" minia-icon-"], .mainnav ul li .sub li .sub a span[class*=" iconic-icon-"], .mainnav ul li .sub li .sub a span[class*=" meteo-icon-"], .mainnav ul li .sub li .sub a span[class*=" silk-icon-"], .mainnav ul li .sub li .sub a span[class*=" typ-icon-"], .mainnav ul li .sub li .sub a span[class*=" wpzoom-"],.mainnav ul li .sub li .sub a span[class*=" eco-"]  {
@@ -2206,8 +2270,8 @@ h4 .icon span:hover {color: #3F3F3F;}
     box-shadow:  0px 0px 0px 1px rgba(0, 0, 0, 0.1);
 }
 
-.galleryView>li .actionBtn {position: absolute; bottom:10px; width: 100%;}
-.galleryView>li .actionBtn a {
+.galleryView>li .actionBtn, .movieGalleryView>li .actionBtn {position: absolute; bottom:10px; width: 100%;}
+.galleryView>li .actionBtn a, .movieGalleryView>li .actionBtn a  {
   padding:3px; 
   background: #000;
   -webkit-border-radius:2px;
@@ -2223,6 +2287,11 @@ h4 .icon span:hover {color: #3F3F3F;}
 .galleryView>li .actionBtn a:first-child {float: left; margin-left:10px;}
 .galleryView>li .actionBtn a:last-child {float: right; margin-right: 10px;}
 
+.movieGalleryView>li .actionBtn a span { margin-left:0; margin-right: 0; }
+.movieGalleryView>li .actionBtn a:first-child {float: left; margin-left:10px;}
+.movieGalleryView>li .actionBtn a:last-child {float: right; margin-right: 10px;}
+
+
 /*Activity widget*/
 .activity {position: relative; list-style:none; padding-top: 15px; margin-left:0; padding-bottom: 0;}
 .activity li {border-bottom: 1px solid #c4c4c4; padding: 10px 0 15px 0; width: 100%;}
@@ -3106,5 +3175,16 @@ form input.valid {border: 1px solid #9FC569 !important;}
   width: 170px;
   text-align: center;
   
-  img { width: auto; height: 65px;}
+  img { width: auto; height: 60px;}
+}
+
+.version-nr {
+  position: absolute;
+  right: 20px;
+  top: 5px;
+  font-weight: bold;
+}
+
+.input-datepicker {
+  width:  160px;
 }

data/app/assets/stylesheets/backend/menu.css.scss

@@ -148,6 +148,23 @@ $inactive_color: #dddddd;
   display: none;
 }
 
+#box1View {
+  padding: 0px;
+}
+
+#box1View option, #fake-select li  {
+  word-wrap: break-all;
+  white-space: pre-wrap;
+  padding: 5px;
+  font-size: 12px;
+}
+
+#fake-select :nth-child(even), #box1View :nth-child(even){
+  background: #EBECEC;
+}
+
+
+
 .panel-body .form-group .select-box {
   height: 200px;
 
@@ -206,10 +223,11 @@ $inactive_color: #dddddd;
       
     }
     .displayed_false {
-      color: $inactive_color; 
+//      color: $inactive_color;
+      text-decoration: line-through;
    }
     .selected   {
-      background-color: $selectColor;
+      background-color: $selectColor !important;
     }
 
     .always_true {
@@ -222,6 +240,7 @@ $inactive_color: #dddddd;
 .warning {
   font-weight: bold;
   color: red;
+  padding-right: 7px;
 }
 .blank-delete  {
   display: inline-block;
@@ -232,7 +251,8 @@ $inactive_color: #dddddd;
 }
 
 .displayed_false {
-  color:$inactive_color ; 
+//  color:$inactive_color ;
+  text-decoration: line-through;
 }
 
 .form-group > .searchBox {
@@ -284,4 +304,7 @@ $inactive_color: #dddddd;
   .active_true:before, .active_false:before {
     left: 0px;
   }
+}
+.content_type, .updated {
+  padding-right: 6px;
 }