mdd 3.1.1 → 3.1.2

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/login/login.css

@@ -3,7 +3,7 @@ html {
 }
 
 body, input, button, textarea, select, select option {
-	font-family: 'Gafata', 'Lucida Sans Unicode', 'Lucida Grande', sans-serif;	
+	font-family: 'Open Sans', sans-serif;	
 }
 
 body {
@@ -38,7 +38,7 @@ div.field {
 
 div.field input, textarea {
 	padding: 0px 10px !important;
-	width: 350px;
+	width: 350px !important;
 	
  	border: 1px solid #c2c2c2 !important;
 	border-radius: 5px;
@@ -126,4 +126,28 @@ div#mainbody #login_session_text img {
 	display:block;
 	margin: 40px auto;
 	text-align: center;
+}
+
+div#system_notice {
+
+  background: #f7dc99; /* Old browsers */
+  background: -moz-linear-gradient(top, #f7dc99 0%, #fff6b2 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7dc99), color-stop(100%,#fff6b2)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #f7dc99 0%,#fff6b2 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #f7dc99 0%,#fff6b2 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #f7dc99 0%,#fff6b2 100%); /* IE10+ */
+  background: linear-gradient(to bottom, #f7dc99 0%,#fff6b2 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7dc99', endColorstr='#fff6b2',GradientType=0 ); /* IE6-9 */
+  
+  position:fixed;
+  top: 0;
+  right: 0;
+  display: block;
+  padding: 15px;
+  margin: 10px;
+  box-shadow: 0 0 5px #fff6b2;
+  border: 1px solid #F4AF0E;
+  border-radius: 5px;
+  z-index: 20;
+  cursor:pointer;
 }

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/system_manifest.css

@@ -5,5 +5,6 @@
  *= require ./template/template
  *= require_tree ../jquery
  *= require ./template/backend
+ *= require ./template/menu
  *= require_tree ../app
 */

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/backend.css.erb

@@ -1,9 +1,8 @@
 body, input, button, textarea, select, select option {
-  font-family: 'Lucida Sans Unicode', 'Lucida Grande', sans-serif;  
+  font-family: 'Open Sans', sans-serif;  
 }
 
 body {
-  background: url("<%= asset_path 'mdwa/backend_bg.png' %>");
   height:100%;
   font-size: 13px;
 }
@@ -20,10 +19,6 @@ a {
   width: 100%;
 }
 
-div#logo {
-  margin: 20px;
-}
-
 div#logo a {
   color: #fff;
   text-decoration:none;
@@ -51,24 +46,19 @@ div#logged_info .welcome, div#logged_info .logout {
 /* Content page header */
 /***********************/
 div.page_header {
-  background: #EEEEEE; /* Old browsers */
-  background: -moz-linear-gradient(top,  #FFFFFF 0%, #EEEEEE 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(100%,#EEEEEE)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top,  #FFFFFF 0%,#EEEEEE 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top,  #FFFFFF 0%,#EEEEEE 100%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top,  #FFFFFF 0%,#EEEEEE 100%); /* IE10+ */
-  background: linear-gradient(top,  #FFFFFF 0%,#EEEEEE 100%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#EEEEEE',GradientType=0 ); /* IE6-9 */
-
-
   border-bottom: 1px solid #ccc;
-  padding: 15px 30px;
+  padding: 15px 10px;
   margin: 0;
-  box-shadow: 0 0 5px #aaa;
 }
 
-div.page_header h1 {
-  font-size: 16px;
+div.page_header_blank {
+  padding: 15px 30px;
+  margin: 0 0 10px 0;
+}
+
+div.page_header h1,
+div.page_header_blank h1 {
+  font-size: 20px;
   color: #036;
   color: black;
   font-weight: normal;
@@ -146,81 +136,11 @@ div.tab_header a:hover {
 /* Content */
 div#content {
   background: #fff;
-  left: auto;
-  margin-left: 240px;
-  margin-right: 0;
-  min-height: 800px;
   padding-bottom: 25px;
-  position: relative;
-  top: auto;
-  width: auto;
-  z-index: 15;
-  box-shadow: 1px 1px 12px rgba(0, 0, 0, 0.7);
+  width: 100%;
 }
 
 div.inside {
   margin:0;
   padding: 10px;
-}
-
-/* Leftbar */
-#leftbar {
-    display: block;
-    float: left;
-    position: relative;
-    width: 240px;
-    z-index: 16;
-}
-
-#leftbar ul {
-  padding: 0;
-  margin: 0;
-}
-
-#leftbar ul li {
-  width: 100%;
-  border-bottom: 1px solid #4A4A4A;
-  border-top: 1px solid #858585;
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-  position: relative;
-}
-
-#leftbar ul li a {
-  -moz-box-sizing: border-box;
-  color: #FFFFFF;
-  display: inline-block;
-  font-size: 13px;
-  font-weight: normal;
-  padding: 11px 0;
-  text-decoration: none;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
-  width: 100%;
-}
-
-#leftbar ul li a:hover {     
-  background-image: rgba(0, 0, 0, 0.075);
-}
-
-#leftbar ul.submenu {
-  background: none repeat scroll 0 0 #555555;
-  box-shadow: 0 0 3px #333333 inset;
-}
-
-#leftbar ul.submenu li {
-  border:none;
-}
-
-#leftbar ul.submenu li a:hover {
-   background-image: rgba(0, 0, 0, 0.075);
-}
-
-#leftbar ul li a span {
-  padding-left: 15px;
-}
-
-#leftbar ul.submenu li a span {
-  margin:0;
-  padding-left: 25px;
 }

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/menu.css

@@ -0,0 +1,86 @@
+/* menu */
+#menu {
+  display: block;
+  height: auto;
+  width: 100%;
+
+  background: #EEEEEE; /* Old browsers */
+  background: -moz-linear-gradient(top,  #FFFFFF 0%, #EEEEEE 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(100%,#EEEEEE)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  #FFFFFF 0%,#EEEEEE 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  #FFFFFF 0%,#EEEEEE 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  #FFFFFF 0%,#EEEEEE 100%); /* IE10+ */
+  background: linear-gradient(top,  #FFFFFF 0%,#EEEEEE 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#EEEEEE',GradientType=0 ); /* IE6-9 */
+
+  border-bottom: 1px solid #ccc;
+  margin: 0;
+  box-shadow: 0 0 5px #aaa;
+}
+
+#menu ul {
+  padding: 0;
+  margin: 0;
+  width: 100%;
+}
+
+#menu ul li {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  display: inline-block;
+}
+
+#menu ul li a {
+  color: #444;
+  display: inline-block;
+  font-size: 14px;
+  font-weight: normal;
+  padding: 10px 15px;
+  text-decoration: none;
+}
+
+#menu ul li a:hover,
+#menu ul li a:active,
+#menu ul li a:focus {     
+  background: rgba(0, 0, 0, 0.075);
+}
+
+#menu ul.submenu {
+  display: none;
+  box-shadow: 0 0 3px #333333 inset;
+  border-bottom: 1px solid #ddd;
+}
+
+#menu ul li:hover ul.submenu {
+  display: block;
+  position: absolute;
+  top: 100px;
+  box-shadow: 2px 2px 4px #b2b2b2;
+  max-width: 200px;
+}
+
+#menu ul.submenu li {
+  background: #ffffff; /* Old browsers */
+  background: -moz-linear-gradient(top,  #ffffff 0%, #eeeeee 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  #ffffff 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  #ffffff 0%,#eeeeee 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  #ffffff 0%,#eeeeee 100%); /* IE10+ */
+  background: linear-gradient(to bottom,  #ffffff 0%,#eeeeee 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
+
+  border-bottom: 1px solid #ddd;
+  display: block;
+  overflow: hidden;
+}
+
+#menu ul.submenu li a {
+  display: block;
+  font-size: 12px;
+  padding: 7px;
+}
+
+#menu ul.submenu li a:hover {
+   background-color: rgba(0,0,0, 0.03);
+}

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/template.css.erb

@@ -137,6 +137,19 @@ a {
           transition: background-position 0.1s linear;
 }
 
+a.export,
+input[type="submit"].export,
+input[type="button"].export,
+button.export {
+  background: none;
+  border:none;
+  cursor: pointer;
+  color: #0000ff;
+  text-decoration:underline;
+  font-size: 12px;
+  margin-left: 5px;
+}
+
 a.cancel {
   background: none;
   color: #ff0000;
@@ -171,8 +184,14 @@ a.remove span {
 
 /* nested_forms buttons */
 a.add_nested_fields {
-  background: url( <%= asset_path 'mdwa/icons/add.png' %>) no-repeat scroll 0 50% padding-box transparent;
-  padding: 0 0 0 20px;
+  background: url( <%= asset_path 'mdwa/icons/add.png' %>) no-repeat scroll 10px 50% padding-box #f2f2f2;
+  border: 1px solid #CCCCCC;
+  border-radius: 4px 4px 4px 4px;
+  display: inline-block;
+  letter-spacing: normal;
+  margin: 10px;
+  padding: 10px 10px 10px 35px;
+  word-spacing: normal;
 }
 
 a.remove_nested_fields {
@@ -292,20 +311,20 @@ table.list td, div.list div.line {
 }
 
 div.list div.head {
-	float:left;
-	width:100%;
-	padding: 8px 0;
+  float:left;
+  width:100%;
+  padding: 8px 0;
 }
 
 div.list {
-	padding: 10px 0;
-	float:left;
+  padding: 10px 0;
+  float:left;
 }
 
 div.list div.line {
-	padding: 10px 0;
-	float:left;
-	width:100%;
+  padding: 10px 0;
+  float:left;
+  width:100%;
 }
 
 .odd_line {
@@ -381,7 +400,8 @@ div.box {
 }
 
 p.descricao {
-  margin: 20px;
+  margin: 10px;
+  font-size: 13px;
 }
 
 .bordered_top {
@@ -402,6 +422,25 @@ p.descricao {
   border-left: 1px solid #d2d2d2;
 }
 
+.bordered_right {
+  margin-right: 10px;
+  padding-right: 10px;
+  border-right: 1px solid #d2d2d2;
+}
+
+.bordered_right h3,
+.bordered_left h3,
+.bordered_top h3,
+.bordered_bottom h3 {
+  margin: 0;
+  padding: 0
+}
+
+.bordered_bottom h3 {
+  margin-top: 20px;
+}
+
+
 .botao_direita_titulo {
   margin-top: 8px;
   text-align:right;
@@ -542,15 +581,19 @@ div.field textarea {
 }
 
 div.topo {
-  padding: 15px 0;
+  background: none repeat scroll 0 0 #F5F5F5;
+  border: 1px solid #DDDDDD;
+  margin-bottom: 20px;
+  padding: 10px;
 }
 
-div.inside div.field input[type="text"],
-div.inside div.field input[type="email"],
-div.inside div.field input[type="number"],
-div.inside div.field input[type="password"],
-div.inside div.field select,
-div.inside div.field textarea {
+
+div.field input[type="text"],
+div.field input[type="email"],
+div.field input[type="number"],
+div.field input[type="password"],
+div.field select,
+div.field textarea {
   width: 100%;
   border: 1px solid #888;
   padding: 4px 0;
@@ -632,3 +675,13 @@ p.description {
   margin: 5px;
   font-size: 11px;
 }
+
+div.label_height {
+  display: block;
+  height: 20px;
+}
+
+div.field.datas input[type="text"].datepicker {
+  display: inline-block;
+  width: 40%;
+}

data/lib/generators/mdwa/sandbox/templates/app/controllers/a/backend_controller.rb

@@ -2,6 +2,7 @@
 class A::BackendController < ApplicationController
 
 	before_filter :authenticate_a_user!
+  before_filter :guardar_per_page
 
 	check_authorization
 
@@ -13,4 +14,17 @@ class A::BackendController < ApplicationController
 		return current_a_user
 	end
 	helper_method :current_user
+
+
+  # Uma vez que se altere o per_page, ele vai pra sessão.
+  # Isso facilita buscas globais e não perde o per_page em listas com filtros.
+  def guardar_per_page
+    if params[:per_page].blank?
+      params[:per_page] = session[:per_page]
+    else
+      session[:per_page] = params[:per_page]
+    end
+  end
+
+
 end

data/lib/generators/mdwa/sandbox/templates/app/models/permission.rb

@@ -1,9 +1,9 @@
 # -*- encoding : utf-8 -*-
 class Permission < ActiveRecord::Base
 
+  attr_accessible :name
+
   has_and_belongs_to_many :user
-  
   validates :name, :uniqueness => true
-  attr_accessible :name
 
 end