padrino-admin 0.9.4 → 0.9.5

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/padrino-admin/generators/templates/assets/stylesheets/base.css

@@ -1,370 +1,94 @@
-* {margin:0;padding:0}
-.clear { clear: both; height: 0; }
-
-.wat-cf:after {
-     content: "."; 
-     display: block; 
-     height: 0; 
-     clear: both; 
-     visibility: hidden;
-}
-
-.wat-cf {display: inline-block;}
-
+*{margin:0;padding:0}
+.clear{clear:both;height:0;}
+.wat-cf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.wat-cf{display:inline-block;}
 /* Hides from IE-mac \*/
-* html .wat-cf {height: 1%;}
-.wat-cf {display: block;}
+* html .wat-cf{height:1%;}
+.wat-cf{display:block;}
 /* End hide from IE-mac */
-
-h1 { margin: 15px 0; font-size: 22px; font-weight: normal; }
-h2 { font-size: 22px; margin: 15px 0; font-weight: normal;}
-h3 { font-size: 18px; margin: 10px 0; font-weight: normal;}
-h4 { font-size: 16px; margin: 10px 0; font-weight: normal;}
-hr {height: 1px; border: 0; }
-p { margin: 15px 0;}
-a img { border: none; }
-
-body {
-  font-size: 12px;
-  font-family: sans-serif;  
-}
-
-#container {
-  min-width: 960px;
-}
-
-#header, #wrapper {
-  padding: 0 20px;
-}
-
-#header {
-  position: relative;
-  padding-top: 1px;  
-}
-
-#header h1 {
-  margin: 0;
-  padding: 10px 0;  
-  font-size: 26px;
-}
-
-#header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited {
-  text-decoration: none;
-}
-
-#main {
-  width: 73%;
-  float: left;
-}
-
-.actions-bar {
-  padding: 10px 1px;
-}
-
-.actions-bar .actions {
-  float: left;
-}
-
-.actions-bar .pagination {
-  float: right;
-  padding: 1px 0;
-}
-
-#sidebar {
-  width: 25%;
-  float: right;      
-}
-
-#sidebar h3 {  
-  padding: 10px 15px;
-  margin: 0;
-  font-size: 13px;
-}
-
-#sidebar .block {
-  margin-bottom: 20px;
-  padding-bottom: 10px;
-}
-
-#sidebar .block .content {
-  padding: 0 15px;
-}
-
-#sidebar ul.navigation li a:link, #sidebar ul.navigation li a:visited {
-  display: block;
-  padding: 10px 15px;
-}
-
-#sidebar .block .sidebar-block, #sidebar .notice {
-  padding:10px;
-}
-
-.message.notice, .message.warning, .message.error {
-  padding:10px;
-}
-
-#wrapper {
-  padding-top: 20px;
-}
-
-#main .block {
-  margin-bottom: 20px;
-  padding-top: 1px;
-}
-
-#main .block .content .inner {
-  padding: 0 15px 15px;  
-}
-
-#main .block .content .inner .navform {
-  text-align:right;
-}
-
-#main .main p.first {
-  margin-top: 0;
-}
-
-#user-navigation {
-  position: absolute;
-  top: 0px;
-  right: 20px;  
-}
-
-#main-navigation {
-  width: 100%;
-}
-
-#user-navigation ul, #main-navigation ul, .secondary-navigation ul, #sidebar ul.navigation {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-#user-navigation ul li, #main-navigation ul li, .secondary-navigation ul li {
-  float: left;  
-}
-
-#main-navigation ul li {
-  margin-right: 5px;
-}
-
-#user-navigation ul li {
-  padding: 5px 10px;
-}
-
-#main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active,
-.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active,
-#user-navigation ul li a:link, #user-navigation ul li a:visited, #user-navigation ul li a:hover, #user-navigation ul li a:active {
-  text-decoration: none;
-}
-
-#main-navigation ul li a {
-  font-size: 14px;
-  line-height: 14px;
-  display: block;
-  padding: 8px 15px;
-}
-
-.secondary-navigation {
-  font-size: 13px;  
-  border-bottom-width: 10px;
-  border-bottom-style: solid;
-}
-
-.secondary-navigation ul li a {
-  display: block;
-  padding: 10px 15px;  
-}
-
-#footer {
-  padding-bottom: 20px;
-}
-
+h1{margin:15px 0;font-size:22px;font-weight:normal;}
+h2{font-size:22px;margin:15px 0;font-weight:normal;}
+h3{font-size:18px;margin:10px 0;font-weight:normal;}
+h4{font-size:16px;margin:10px 0;font-weight:normal;}
+hr{height:1px;border:0;}
+p{margin:15px 0;}
+a img{border:none;}
+body{font-size:12px;font-family:sans-serif;}
+#container{min-width:960px;}
+#header,#wrapper{padding:0 20px;}
+#header{position:relative;padding-top:1px;}
+#header h1{margin:0;padding:10px 0;font-size:26px;}
+#header h1 a:link,#header h1 a:active,#header h1 a:hover,#header h1 a:visited{text-decoration:none;}
+#main{width:73%;float:left;}
+.actions-bar{padding:10px 1px;}
+.actions-bar .actions{float:left;}
+.actions-bar .pagination{float:right;padding:1px 0;}
+#sidebar{width:25%;float:right;}
+#sidebar h3{padding:10px 15px;margin:0;font-size:13px;}
+#sidebar .block{margin-bottom:20px;padding-bottom:10px;}
+#sidebar .block .content{padding:0 15px;}
+#sidebar ul.navigation li a:link,#sidebar ul.navigation li a:visited{display:block;padding:10px 15px;}
+#sidebar .block .sidebar-block,#sidebar .notice{padding:10px;}
+.message.notice,.message.warning,.message.error{padding:10px;}
+#wrapper{padding-top:20px;}
+#main .block{margin-bottom:20px;padding-top:1px;}
+#main .block .content .inner{padding:0 15px 15px;}
+#main .block .content .inner .navform{text-align:right;}
+#main .main p.first{margin-top:0;}
+#user-navigation{position:absolute;top:0px;right:20px;}
+#main-navigation{width:100%;}
+#user-navigation ul,#main-navigation ul,.secondary-navigation ul,#sidebar ul.navigation{margin:0;padding:0;list-style-type:none;}
+#user-navigation ul li,#main-navigation ul li,.secondary-navigation ul li{float:left;}
+#main-navigation ul li{margin-right:5px;}
+#user-navigation ul li{padding:5px 10px;}
+#main-navigation ul li a:link,#main-navigation ul li a:visited,#main-navigation ul li a:hover,#main-navigation ul li a:active,
+.secondary-navigation ul li a:link,.secondary-navigation ul li a:visited,.secondary-navigation ul li a:hover,.secondary-navigation ul li a:active,
+#user-navigation ul li a:link,#user-navigation ul li a:visited,#user-navigation ul li a:hover,#user-navigation ul li a:active{text-decoration:none;}
+#main-navigation ul li a{font-size:14px;line-height:14px;display:block;padding:8px 15px;}
+.secondary-navigation{font-size:13px;border-bottom-width:10px;border-bottom-style:solid;}
+.secondary-navigation ul li a{display:block;padding:10px 15px;}
+#footer{padding-bottom:20px;}
 /* pagination */
-
-.pagination a, .pagination span {
-  padding: 2px 5px;
-  margin-right: 5px; 
-  display: block;
-  float: left;
-  border-style: solid;
-  border-width: 1px;
-}
-
-.pagination span.current {
-  font-weight: bold;  
-}
-
-.pagination a {
-  text-decoration: none;  
-}
-
+.pagination a,.pagination span{padding:2px 5px;margin-right:5px;display:block;float:left;border-style:solid;border-width:1px;}
+.pagination span.current{font-weight:bold;}
+.pagination a{text-decoration:none;}
 /* tables */
-.table {
-  width: 100%;
-  border-collapse: collapse;  
-  margin-bottom: 15px;
-}
-
-.table th {
-  padding: 10px;
-  font-weight: bold;
-  text-align: left;
-}
-
-.table th.first {
-  width: 30px;
-}
-
-/*.table th.last {
-  width: 200px;  
-}*/
-
-.table .checkbox {
-  margin-left: 10px;
-}
-
-.table td {
-  padding: 10px;
-}
-
-.table td.last {
-  text-align: right;
-}
-
+.table{width:100%;border-collapse:collapse;margin-bottom:15px;}
+.table th{padding:10px;font-weight:bold;text-align:left;}
+/*.table th.first{width:30px;}*/
+/*.table th.last{width:200px;}*/
+.table .checkbox{margin-left:10px;}
+.table td{padding:10px;}
+.table td.last{text-align:right;}
 /* forms */
-
-input.checkbox {
-  margin: 0;
-  padding: 0;
-}
-
-.form .group {
-  margin-bottom: 15px;
-}
-
-.form div.left {
-  width: 20%;
-  float: left;
-}
-
-.form div.right {
-  width: 75%;
-  float: right;
-}
-
-.form .columns .column {
-  width: 48%;
-}
-
-.form .columns .left {
-  float: left;
-}
-
-.form .columns .right {
-  float: right;
-}
-
-.form label, .form input.text_field, .form textarea.text_area {
-  font-size: 1.2em;
-  padding: 1px 0;
-  margin: 0;
-}
-
-.form label.right {
-  text-align: right;
-}
-
-.form input.checkbox, .form input.radio {
-  margin-right: 5px;
-}
-
-.form label.checkbox, .form label.radio {
-  line-height: 1.5em;
-}
-
-.form label {
-  padding-bottom: 2px;  
-  font-weight: bold;
-}
-
-.form .error {
-  color: red;
-}
-
-.form a {
-  color:red;
-  font-size:14px;
-}
-
-.form input.text_field, .form textarea.text_area {
-  width: 100%;
-  border-width: 1px;
-  border-style: solid;
-}
-
-.button_to {
-  display:inline;
-}
-
-.button_to input{
-  background:none;
-  border:none;
-  display:inline;
-  font-size:12px;
-  color:#A72D2E;
-  cursor:pointer;
-}
-
+input.checkbox{margin:0;padding:0;}
+.form .group{margin-bottom:15px;}
+.form div.left{width:20%;float:left;}
+.form div.right{width:75%;float:right;}
+.form .columns .column{width:48%;}
+.form .columns .left{float:left;}
+.form .columns .right{float:right;}
+.form label,.form input.text_field,.form textarea.text_area{font-size:1.0em;padding:2px 0;margin:0;color:#36393D;}
+.form label.right{text-align:right;}
+.form input.checkbox,.form input.radio{margin-right:5px;}
+.form label.checkbox,.form label.radio{line-height:1.5em;}
+.form label{padding-bottom:2px;font-weight:bold;}
+.form .error{color:red;}
+.form a{color:red;font-size:14px;}
+.form input.text_field,.form textarea.text_area{width:100%;border-width:1px;border-style:solid;}
+.button_to{display:inline;}
+.button_to input{background:none;border:none;display:inline;font-size:12px;color:#A72D2E;cursor:pointer;}
 /* lists */
-
-ul.list {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-ul.list li {
-  clear: left;
-  padding-bottom: 5px;
-}
-
-ul.list li .left {
-  float: left;  
-}
-
-ul.list li .left .avatar {
-  width: 50px;
-  height: 50px;
-}
-
-ul.list li .item {
-  margin-left: 80px;
-}
-
-ul.list li .item .avatar {
-  float: left;
-  margin: 0 5px 5px 0;
-  width: 30px;
-  height: 30px;
-}
-
+ul.list{margin:0;padding:0;list-style-type:none;}
+ul.list li{clear:left;padding-bottom:5px;}
+ul.list li .left{float:left;}
+ul.list li .left .avatar{width:50px;height:50px;}
+ul.list li .item{margin-left:80px;}
+ul.list li .item .avatar{float:left;margin:0 5px 5px 0;width:30px;height:30px;}
 /* box */
-
-#box {
-  width: 500px;
-  margin: 50px auto;  
-}
-
-#box .block {
-  margin-bottom: 20px;
-}
-
-#box .block h2 {
-  padding: 10px 15px;
-  margin: 0;  
-}
-
-#box .block .content {
-  padding: 10px 20px;
-}
+#box{width:500px;margin:50px auto;}
+#box .block{margin-bottom:20px;}
+#box .block h2{padding:10px 15px;margin:0;}
+#box .block .content{padding:10px 20px;}
+/* custom */
+.code{font-family: Courier, 'Courier New', monospace;color:#36393D;}

data/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title><%= options[:name] %></title>
-  <%%= stylesheet_link_tag :base, :override, "themes/<%= options[:theme] %>/style" %>
+  <%%= stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style" %>
 </head>
 <body>
   <div id="container">

data/lib/padrino-admin/generators/templates/erb/page/index.erb.tt

@@ -18,7 +18,7 @@
         <%% @<%= @orm.name_plural %>.each do |<%= @orm.name_singular %>| %>
         <tr>
           <%- @orm.columns.each_with_index do |column, i| -%>
-          <td<%= " class=\"first\"" if i==0 %>><%%= link_to <%= @orm.name_singular %>.<%= column.name %>, url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id) %></td>
+          <td<%= " class=\"first\"" if i==0 %>><%%= <%= @orm.name_singular %>.<%= column.name %> %></td>
           <%- end -%>
           <td class="last">
             <%%= button_to pat(:edit), url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :method => :get, :class => :button_to %> |

data/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt

@@ -3,7 +3,7 @@
   %head
     %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
     %title <%= options[:name] %>
-    =stylesheet_link_tag :base, :override, "themes/<%= options[:theme] %>/style"
+    =stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style"
   %body
     #container
       #header

data/lib/padrino-admin/generators/templates/haml/page/index.haml.tt

@@ -17,7 +17,7 @@
         -@<%= @orm.name_plural %>.each do |<%= @orm.name_singular %>|
           %tr
             <%- @orm.columns.each_with_index do |column, i| -%>
-            %td<%= ".first" if i==0 %>=link_to <%= @orm.name_singular %>.<%= column.name %>, url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id)
+            %td<%= ".first" if i==0 %>=<%= @orm.name_singular %>.<%= column.name %>
             <%- end -%>
             %td.last
               =button_to pat(:edit), url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :method => :get, :class => :button_to 

data/lib/padrino-admin/helpers/view_helpers.rb

@@ -27,7 +27,7 @@ module Padrino
         #   mat(:account, :email)
         # 
         def model_attribute_translate(model, attribute)
-          t("models.#{model}.#{attribute}", :default => attribute.to_s.humanize)
+          t("models.#{model}.attributes.#{attribute}", :default => attribute.to_s.humanize)
         end
         alias :mat :model_attribute_translate
 

data/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-03-11}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -94,18 +94,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.4"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.9.4"])
-      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.9.4"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.5"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.9.5"])
+      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.9.5"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
-      s.add_dependency(%q<padrino-core>, ["= 0.9.4"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.9.4"])
-      s.add_dependency(%q<padrino-helpers>, ["= 0.9.4"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.5"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.9.5"])
+      s.add_dependency(%q<padrino-helpers>, ["= 0.9.5"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -113,9 +113,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.4"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.9.4"])
-    s.add_dependency(%q<padrino-helpers>, ["= 0.9.4"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.5"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.9.5"])
+    s.add_dependency(%q<padrino-helpers>, ["= 0.9.5"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 4
-        version: 0.9.4
+        - 5
+        version: 0.9.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,8 +44,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 4
-        version: 0.9.4
+        - 5
+        version: 0.9.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 4
-        version: 0.9.4
+        - 5
+        version: 0.9.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency