lolita 3.1.16 → 3.1.17

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.1.16"
+  s.version = "3.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ITHouse (Latvia) and Arturs Meisters}]
-  s.date = %q{2011-08-30}
+  s.date = %q{2011-09-01}
   s.description = %q{Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. }
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/configuration/nested_form/_display.html.erb",
     "app/views/components/lolita/configuration/nested_form/_fields.html.erb",
     "app/views/components/lolita/configuration/tab/_display.html.erb",
+    "app/views/components/lolita/configuration/tab/_error_msg.html.erb",
     "app/views/components/lolita/configuration/tab/_fields.html.erb",
     "app/views/components/lolita/configuration/tab/_form.html.erb",
     "app/views/components/lolita/configuration/tab/content/_display.html.erb",
@@ -83,6 +84,13 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/shared/_flash.html.erb",
     "app/views/components/lolita/shared/_header.html.erb",
     "app/views/components/lolita/shared/_right_sidebar.html.erb",
+    "app/views/kaminari/lolita/_first_page.html.erb",
+    "app/views/kaminari/lolita/_gap.html.erb",
+    "app/views/kaminari/lolita/_last_page.html.erb",
+    "app/views/kaminari/lolita/_next_page.html.erb",
+    "app/views/kaminari/lolita/_page.html.erb",
+    "app/views/kaminari/lolita/_paginator.html.erb",
+    "app/views/kaminari/lolita/_prev_page.html.erb",
     "app/views/layouts/lolita/application.html.erb",
     "app/views/lolita/info/index.html.erb",
     "app/views/lolita/rest/form.html.erb",
@@ -106,7 +114,6 @@ Gem::Specification.new do |s|
     "lib/lolita/adapter/abstract_adapter.rb",
     "lib/lolita/adapter/active_record.rb",
     "lib/lolita/adapter/mongoid.rb",
-    "lib/lolita/base_configuration.rb",
     "lib/lolita/builder.rb",
     "lib/lolita/configuration/base.rb",
     "lib/lolita/configuration/column.rb",
@@ -155,6 +162,8 @@ Gem::Specification.new do |s|
     "lib/lolita/ruby_ext/accessors.rb",
     "lib/lolita/support/formatter.rb",
     "lib/lolita/support/formatter/rails.rb",
+    "lib/lolita/system_configuration/application.rb",
+    "lib/lolita/system_configuration/base.rb",
     "lib/lolita/test/matchers.rb",
     "lolita.gemspec",
     "public/images/lolita/plus.png",
@@ -403,6 +412,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<kaminari>, ["~> 0.12.4"])
       s.add_runtime_dependency(%q<abstract>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
+      s.add_runtime_dependency(%q<haml>, ["~> 3.1.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.0"])
@@ -418,6 +428,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
       s.add_dependency(%q<abstract>, [">= 0"])
       s.add_dependency(%q<builder>, ["~> 2.1.2"])
+      s.add_dependency(%q<haml>, ["~> 3.1.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])
@@ -434,6 +445,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
     s.add_dependency(%q<abstract>, [">= 0"])
     s.add_dependency(%q<builder>, ["~> 2.1.2"])
+    s.add_dependency(%q<haml>, ["~> 3.1.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])

data/public/javascripts/lolita/tab.js

@@ -21,22 +21,17 @@ $(function(){
       }
     })
   }
+  function save_all(){
+    var tab = $("#content").children("div[data-tabs-url]")
+    save_tab(tab)
+  }
   // Submit all forms through Ajax when Save All button clicked.
   $("button.save-all").live('click',function(){
     //var tab=$(this).parents("div[data-tabs-url]")
-    var tab = $("#content").children("div[data-tabs-url]")
-    save_tab(tab)
+    save_all()
   })
   // All tabs are closable when clicked on tab title.
-  $(".tab .tab-title").live('click',function(){
-    var tab_title=$(this)
-    var closed=tab_title.data("closed") || (tab_title.attr("data-closed")=="false" ? false : true)
-      if(closed){
-        tab_title.parents(".tab").find(".tab-content").show("fast")
-      }else{
-        tab_title.parents(".tab").find(".tab-content").hide("fast")
-      }
-      tab_title.data("closed",!closed)
-    })
-    // Flash is hidden when clicked on
-})
+  $(".tab.minimized .tab-title").live('click',function(){
+		$(this).parent().toggleClass("minimized", 200)
+	})
+})

data/public/stylesheets/lolita/style.css

@@ -1,10 +1,22 @@
+html,body{
+  height: 100%;
+}
 body {background: #f3f3f3; font-size: 13px;}
 
 a, a:visited, a:active {color: #7ac1ed; text-decoration: none;}
 input[type="button"] {vertical-align: top; padding: 3px 9px;}
 h1 {font-size: 28px; font-weight: normal; letter-spacing: -1px; line-height: 85px;}
 
-#container {width: 90%; margin: 0 auto;}
+#container {
+  width: 90%;
+  min-height: 100%;height: auto !important;height: 100%;margin: 0 auto -30px;
+}
+#container:before{ /* Opera and IE8 "redraw" bug fix */
+  content:"";
+  float:left;
+  height:100%;
+  margin-top:-999em;
+}
 
 /* same button styles for links and both types of html buttons */
 button, a.button, input[type="button"] {
@@ -31,16 +43,17 @@ header nav .username {margin-right: 15px;}
 
 /* vertical middle container */
 
-#main {position: relative; padding-left: 150px;} /* setting the left portion width for navigation */
+#main {position: relative; padding-left: 150px; margin-bottom: 50px;} /* setting the left portion width for navigation */
 
 /* ---------------------------------------------- */
 
 /* form styles */
 
 #main .box form {background: #FFF; padding: 30px 25px;}
+#main .box form input {background: #FFF;}
 #main .box form label {color: #c3c3c3; font-size: 13px;}
 #main .box form select {min-width: 150px;}
-#main .box form .field {margin: 10px 0;}
+#main .box form .field {margin: 10px 0; overflow: hidden;}
 #main .box form .field:first-child input {
   font-size: 24px;
   -moz-border-radius: 5px;
@@ -68,11 +81,13 @@ header nav .username {margin-right: 15px;}
   -webkit-box-sizing: border-box;
   box-sizing: border-box;  /* IE7 does not support it, IE8 does */
 }
+
+#main .box form .field.boolean .field-value {float: left; width: 20px; margin: 0 5px 0 0;} /* for checkboxes */
 /* ----------------------------------------------*/
 
 /* nested forms */
 
-#main .box form .nested_form {}
+#main .box form .nested_form {margin: 10px 0;}
 #main .box form .nested_form label {display: block; margin-bottom: 5px;}
 #main .box form .nested_form .fields {
   margin: 5px 0 5px 50px; 
@@ -95,11 +110,14 @@ header nav .username {margin-right: 15px;}
 /* -------------------------------- */
 
 /* error fields and notifications */
-.field_with_errors input,
-.field_with_errors textarea {background: #ffe6e7;}
+
+#main .box form .field_with_errors input,
+#main .box form .field_with_errors textarea {background: #ffe6e7;}
 .inline-errors {padding-top: 3px; color:#F66; font-size: 110%;}
 .errorExplanation {color:#F66; font-size: 110%; padding:25px 25px 0; background:white;}
 
+.nested_form .fields .field_with_errors {display: inline;}
+
 #flash {
   position: fixed;
   top: 0;
@@ -117,19 +135,23 @@ header nav .username {margin-right: 15px;}
 /* ---------------------------------- */
 
 /* save box */
+
 #main .box .save {padding: 20px 10px;}
 #main .box .last-save {color: #808080; margin-bottom: 5px;}
 #main .box .save button {
-	width: 100%; 
-	padding: 10px 0; 
-	font-size: 24px; 
-	background: #ab8def; 
-	color: #ffd;
+  width: 100%; 
+  padding: 10px 0; 
+  font-size: 24px; 
+  background: #ab8def; 
+  color: #ffd;
 }
+#main .box .save button:active {position: relative; top: 1px;}
+
 /* ---------------------------------- */
 
 
 /* navigation styles on left */
+
 #main nav {position: absolute; left: 0; width: 150px; margin-top: 5px;} /* width just for now */ 
 #main nav ul {margin-bottom: 50px;}
 #main nav ul.subtree{margin-bottom: 0px;}
@@ -160,23 +182,41 @@ header nav .username {margin-right: 15px;}
 /* --------------------------------------------- */
 
 /* main content part */
+
 #content {overflow: visible; position: relative;} /* overflow for clearing containing floats */
 #content .secondary {position: absolute; right: 0; width: 23%;}
 #content.with-secondary {padding-right: 25%;}
+
 /* --------------------------------------------- */
 
-footer {height: 50px;} /* for not leaving empty space in bottom */
+footer {
+  height: 30px;
+  text-align: right;
+  width:90%;
+  clear:both;
+  margin: 0 auto;
+} 
+.push{
+  padding-bottom: 30px;
+}
+/* for not leaving empty space in bottom */
+#powered{
+  font-size: 11px;
+  margin-right:10px;
+}
 
 /* boxes that, possibly, will be draggable/droppable */
+
 #main .box { /* list-container for small/big bordered box that takes all available parent width */ 
   border: 5px solid #d5d5d5;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
-	margin-bottom: 10px;
+  margin-bottom: 10px;
 } 
 
 .boxtitle {position: relative; z-index: 2} 
+
 .boxtitle h1 {padding: 35px 25px 15px; line-height: 1; cursor: pointer;} /* h1 contains bgcolor, color and text position because arrow needs different bg and it follows after */
 .boxtitle .arrow {
   position: absolute;
@@ -185,6 +225,35 @@ footer {height: 50px;} /* for not leaving empty space in bottom */
   border-style: solid;
   border-width: 10px 10px 0;
 }
+.boxtitle.grey .arrow {
+  border-color: #e2e2e2 transparent transparent;
+}
+
+#main .tab.box.default {border: none;} /* styles for not-on-top grey boxes */
+#main .tab.box.default .boxtitle {
+  border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+}
+#main .tab.box.default form {
+  border: 5px solid #e2e2e2; 
+  border-top: none;
+  border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  -webkit-border-radius: 0 0 5px 5px;
+}
+
+
+#main .tab.box.minimized .boxtitle {
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  height: 50px;
+}
+#main .tab.box.minimized .boxtitle h1 {font-size: 16px; line-height: 50px; padding: 0 0 0 15px;}
+#main .tab.box.minimized .boxtitle .arrow {display: none;}
+#main .tab.box.minimized form {display: none;}
+
 /* ----------------------------------------------*/
 
 /* different colors*/
@@ -196,8 +265,8 @@ footer {height: 50px;} /* for not leaving empty space in bottom */
 .black, a.black {color: #f1f1f1;}
 .grey {
   background: #ededed; /* for IE, Opera */
-  background: -moz-linear-gradient(top, #ededed, #e2e2e2);
-  background: -webkit-linear-gradient(top, #ededed, #e2e2e2);
+  background: -moz-linear-gradient(top, #e4e4e4, #e2e2e2);
+  background: -webkit-linear-gradient(top, #e4e4e4, #e2e2e2);
 }
 .grey, a.grey {color: #8f8f8f;}
 /* --------------------------------------------- */
@@ -209,9 +278,9 @@ footer {height: 50px;} /* for not leaving empty space in bottom */
 .tools > div > * {margin-right: 10px;}
 
 a.create {
-	position: relative;
+  position: relative;
   display: block;
-	z-index: 1;
+  z-index: 1;
   background: #9d81f8;
   background: -moz-linear-gradient(top, #ae91eb, #9d81f8);
   background: -webkit-linear-gradient(top, #ae91eb, #9d81f8);
@@ -244,6 +313,8 @@ a.create {
 .list table tbody tr .tool-cell a {visibility: hidden; margin-right: 5px;}
 .list table tbody tr:hover .tool-cell a {visibility: visible;}
 
+.list table td a:active {position: relative; top: 1px;}
+
 /* filter */
 #main form.filter {
   background: #F3F3F3;
@@ -262,6 +333,31 @@ a.create {
 }
 /* --------------------------------------------- */
 
+/* Pagination */
+
+#main nav.pagination {
+  width: 100%;
+  margin-top: 20px;
+  text-align: center;
+  position: absolute;
+}
+#main nav.pagination span.current,
+#main nav.pagination span.page a {
+  display: inline-block;
+  min-width: 25px; height: 25px; line-height: 25px;
+  font-size: 13px;
+  border: 1px solid #d5d5d5;
+  padding: 0 5px;
+}
+#main nav.pagination span.page a:hover {background: #d5d5d5;}
+#main nav.pagination span.current {background: #9d81f8; color: #fff;}
+#main nav.pagination span.first,
+#main nav.pagination span.prev {margin-right: 5px}
+#main nav.pagination span.next,
+#main nav.pagination span.last {margin-left: 5px;}
+
+/* --------------------------------------------- */
+
 /* TinyMCE advanced theme's skin "Cirkuit" overrides */
 
 #content .cirkuitSkin table.mceLayout {
@@ -344,5 +440,4 @@ a.create {
 {position: relative;}
 .ie8 .black {-pie-background: linear-gradient(top, #686868, #2f2f2f);}
 .ie8 #flash {-pie-background: rgba(256,256,256,0.9);}
-/* ----------------------------------------------*/
-/* ----------------------------------------------*/
+/* ----------------------------------------------*/

data/spec/lolita_spec.rb

@@ -5,7 +5,7 @@ describe Lolita do
   context "#setup" do
     it "should yield Lolita::BaseConfiguration instance" do
       Lolita.setup do |config|
-        config.class.should == Lolita::BaseConfiguration
+        config.class.should == Lolita::SystemConfiguration::Base
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.1.16
+  version: 3.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &69808170 !ruby/object:Gem::Requirement
+  requirement: &81922500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *69808170
+  version_requirements: *81922500
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &69807300 !ruby/object:Gem::Requirement
+  requirement: &81922130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *69807300
+  version_requirements: *81922130
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &69806460 !ruby/object:Gem::Requirement
+  requirement: &81921510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69806460
+  version_requirements: *81921510
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &69805420 !ruby/object:Gem::Requirement
+  requirement: &81920970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,21 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *69805420
+  version_requirements: *81920970
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &81920620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *81920620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &69804570 !ruby/object:Gem::Requirement
+  requirement: &81920210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *69804570
+  version_requirements: *81920210
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &69803630 !ruby/object:Gem::Requirement
+  requirement: &81919760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *69803630
+  version_requirements: *81919760
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &69801110 !ruby/object:Gem::Requirement
+  requirement: &81919250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *69801110
+  version_requirements: *81919250
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &69798870 !ruby/object:Gem::Requirement
+  requirement: &81918840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69798870
+  version_requirements: *81918840
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &69796060 !ruby/object:Gem::Requirement
+  requirement: &81918330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69796060
+  version_requirements: *81918330
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &69792800 !ruby/object:Gem::Requirement
+  requirement: &81917820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69792800
+  version_requirements: *81917820
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &69789790 !ruby/object:Gem::Requirement
+  requirement: &81917420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69789790
+  version_requirements: *81917420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &69787330 !ruby/object:Gem::Requirement
+  requirement: &81916940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69787330
+  version_requirements: *81916940
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &69785560 !ruby/object:Gem::Requirement
+  requirement: &81916650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69785560
+  version_requirements: *81916650
 - !ruby/object:Gem::Dependency
   name: akephalos
-  requirement: &69784660 !ruby/object:Gem::Requirement
+  requirement: &81916370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69784660
+  version_requirements: *81916370
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -230,6 +241,7 @@ files:
 - app/views/components/lolita/configuration/nested_form/_display.html.erb
 - app/views/components/lolita/configuration/nested_form/_fields.html.erb
 - app/views/components/lolita/configuration/tab/_display.html.erb
+- app/views/components/lolita/configuration/tab/_error_msg.html.erb
 - app/views/components/lolita/configuration/tab/_fields.html.erb
 - app/views/components/lolita/configuration/tab/_form.html.erb
 - app/views/components/lolita/configuration/tab/content/_display.html.erb
@@ -240,6 +252,13 @@ files:
 - app/views/components/lolita/shared/_flash.html.erb
 - app/views/components/lolita/shared/_header.html.erb
 - app/views/components/lolita/shared/_right_sidebar.html.erb
+- app/views/kaminari/lolita/_first_page.html.erb
+- app/views/kaminari/lolita/_gap.html.erb
+- app/views/kaminari/lolita/_last_page.html.erb
+- app/views/kaminari/lolita/_next_page.html.erb
+- app/views/kaminari/lolita/_page.html.erb
+- app/views/kaminari/lolita/_paginator.html.erb
+- app/views/kaminari/lolita/_prev_page.html.erb
 - app/views/layouts/lolita/application.html.erb
 - app/views/lolita/info/index.html.erb
 - app/views/lolita/rest/form.html.erb
@@ -263,7 +282,6 @@ files:
 - lib/lolita/adapter/abstract_adapter.rb
 - lib/lolita/adapter/active_record.rb
 - lib/lolita/adapter/mongoid.rb
-- lib/lolita/base_configuration.rb
 - lib/lolita/builder.rb
 - lib/lolita/configuration/base.rb
 - lib/lolita/configuration/column.rb
@@ -312,6 +330,8 @@ files:
 - lib/lolita/ruby_ext/accessors.rb
 - lib/lolita/support/formatter.rb
 - lib/lolita/support/formatter/rails.rb
+- lib/lolita/system_configuration/application.rb
+- lib/lolita/system_configuration/base.rb
 - lib/lolita/test/matchers.rb
 - lolita.gemspec
 - public/images/lolita/plus.png
@@ -507,7 +527,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 833067379
+      hash: 1050265363
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: