lolita 3.1.9 → 3.1.10

data/app/views/components/lolita/configuration/tab/_fields.html.erb

@@ -1,7 +1,7 @@
-<% tab.fields_with_field_set do |fields_or_field,field_set| %>
-  <% if field_set %>
-    <%= render_component :"lolita/configuration/field_set", :display, :fields=>fields_or_field,:field_set=>field_set %>
-  <% else %>
-    <%= render_component :"lolita/configuration/field", :display,:field=>fields_or_field %>
-  <% end %>
+<% tab.fields_with_field_set do |fields_or_field,field_set| %>
+  <% if field_set %>
+    <%= render_component :"lolita/configuration/field_set", :display, :fields=>fields_or_field,:field_set=>field_set %>
+  <% else %>
+    <%= render_component :"lolita/configuration/field", :display,:field=>fields_or_field %>
+  <% end %>
 <% end %>

data/app/views/components/lolita/configuration/tab/content/_display.html.erb

@@ -1 +1 @@
-<%= render_component :"lolita/configuration/tab/default", :display, :tab=>tab  %>
+<%= render_component :"lolita/configuration/tab/default", :display, :tab=>tab  %>

data/app/views/components/lolita/configuration/tab/default/_display.html.erb

@@ -1,9 +1,9 @@
-<%  #
-# FIXME: move to /tab_types/
-#
-%>
-<%= form_tag "#",:multipart=>true, :id=>"tab-form-#{tab.__id__}",:method => resource.new_record? ? :post : :put do |form| %>
-  <div class="tab-content">
-    <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab %>
-  </div>
+<%  #
+# FIXME: move to /tab_types/
+#
+%>
+<%= form_tag "#",:multipart=>true, :id=>"tab-form-#{tab.__id__}",:method => resource.new_record? ? :post : :put do |form| %>
+  <div class="tab-content">
+    <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab %>
+  </div>
 <% end %>

data/app/views/components/lolita/configuration/tabs/_display.html.erb

@@ -1,11 +1,11 @@
-<%= render_component :"lolita/shared", :right_sidebar %>
-
-<% #error messages here not necessary, printing full messages moved to :"lolita/tab" component %>
-<% # = raw resource.errors.full_messages.join("<br>") if resource.errors.any? %>
-
-<% #mode container div with all data-* method to helper and change to block method %>
-<div id="tabs-<%= resource_name %>" class="tabs" data-method="<%=resource.new_record? ? "POST" : "PUT" %>" data-tabs-url="<%=resource.new_record? ? lolita_resources_path : lolita_resource_path(:id=>resource.id)%>">
-  <% tabs.each do |tab| %>
-    <%= render_component :"lolita/configuration/tab", :display, :tab=>tab  %>
-  <% end %>
+<%= render_component :"lolita/shared", :right_sidebar %>
+
+<% #error messages here not necessary, printing full messages moved to :"lolita/tab" component %>
+<% # = raw resource.errors.full_messages.join("<br>") if resource.errors.any? %>
+
+<% #mode container div with all data-* method to helper and change to block method %>
+<div id="tabs-<%= resource_name %>" class="tabs" data-method="<%=resource.new_record? ? "POST" : "PUT" %>" data-tabs-url="<%=resource.new_record? ? lolita_resources_path : lolita_resource_path(:id=>resource.id)%>">
+  <% tabs.each do |tab| %>
+    <%= render_component :"lolita/configuration/tab", :display, :tab=>tab  %>
+  <% end %>
 </div>

data/app/views/components/lolita/navigation/_display.html.erb

@@ -1,3 +1,3 @@
-<nav>
-  <%= render_component :"lolita/navigation",:tree, :tree=>tree %>
+<nav>
+  <%= render_component :"lolita/navigation",:tree, :tree=>tree %>
 </nav>

data/app/views/components/lolita/navigation/_tree.html.erb

@@ -1,39 +1,39 @@
-<% if tree.root? 
-  tree.each do |branch|
-    if branch.object.is_a?(Lolita::Mapping)
-      branch.options[:url]||=lolita_resources_path(branch.object)
-    else
-      branch.options[:url]=if branch.options[:url].respond_to?(:call)
-        branch.options[:url].call(self,branch)
-      else
-        branch.options[:url]
-      end
-    end
-  end
-end %>
-<ul <%=!tree.root? ? "class='subtree'" : ""%> >
-  <% last_branch=tree.branches.last %>
-  <%tree.branches.each do |branch| 
-     if branch.object.is_a?(Lolita::Mapping) 
-       active=if self.respond_to?(:resource_class)
-          branch.object ? branch.object.to==resource_class : false
-        end
-     end 
-     unless active
-       active=branch.self_with_children.detect{|b| 
-         if b.options[:active].respond_to?(:call)
-          b.options[:active].call(self,branch,b)
-         else
-          b.options[:url]==request.path
-         end
-       }
-     end
-    %>
-    <li class="<%=active ? "active" : ""%> <%=branch.children.branches.any? ? "with-subtree" : ""%> <%=!tree.root? && branch==last_branch ? "last-in-subtree" : ""%>">
-      <%= link_to branch.title, branch.options[:url] || "#" %>
-      <% if branch.children.branches.any? %>
-        <%= render_component(:"lolita/navigation",:tree,:tree=>branch.children) %>
-      <% end %>
-    </li>
-  <% end %>
+<% if tree.root? 
+  tree.each do |branch|
+    if branch.object.is_a?(Lolita::Mapping)
+      branch.options[:url]||=lolita_resources_path(branch.object)
+    else
+      branch.options[:url]=if branch.options[:url].respond_to?(:call)
+        branch.options[:url].call(self,branch)
+      else
+        branch.options[:url]
+      end
+    end
+  end
+end %>
+<ul <%=!tree.root? ? "class='subtree'" : ""%> >
+  <% last_branch=tree.branches.last %>
+  <%tree.branches.each do |branch| 
+     if branch.object.is_a?(Lolita::Mapping) 
+       active=if self.respond_to?(:resource_class)
+          branch.object ? branch.object.to==resource_class : false
+        end
+     end 
+     unless active
+       active=branch.self_with_children.detect{|b| 
+         if b.options[:active].respond_to?(:call)
+          b.options[:active].call(self,branch,b)
+         else
+          b.options[:url]==request.path
+         end
+       }
+     end
+    %>
+    <li class="<%=active ? "active" : ""%> <%=branch.children.branches.any? ? "with-subtree" : ""%> <%=!tree.root? && branch==last_branch ? "last-in-subtree" : ""%>">
+      <%= link_to branch.title, branch.options[:url] || "#" %>
+      <% if branch.children.branches.any? %>
+        <%= render_component(:"lolita/navigation",:tree,:tree=>branch.children) %>
+      <% end %>
+    </li>
+  <% end %>
 </ul>

data/app/views/components/lolita/shared/_flash.html.erb

@@ -1,5 +1,5 @@
-<div id="flash" style="display:block">
-  <% if local_assigns[:message] %>
-    <%= message %>
-  <% end %>
-</div>
+<div id="flash" style="display:block">
+  <% if local_assigns[:message] %>
+    <%= message %>
+  <% end %>
+</div>

data/app/views/components/lolita/shared/_header.html.erb

@@ -1,9 +1,9 @@
-<header>
-  <h1>Lolita</h1>
-  <% if lolita_current_user %>
-	  <nav>
-	    <a href="<%=send(:"edit_#{lolita_current_user.class.to_s.downcase}_password_path")%>" class="username"><%=lolita_current_user.email%></a>
-	    <a href="<%=send(:"destroy_#{lolita_current_user.class.to_s.downcase}_session_path")%>" class="button grey"><%=::I18n.t("lolita.shared.log_out")%></a>
-	  </nav>
-  <% end %>
+<header>
+  <h1>Lolita</h1>
+  <% if lolita_current_user %>
+	  <nav>
+	    <a href="<%=send(:"edit_#{lolita_current_user.class.to_s.downcase}_password_path")%>" class="username"><%=lolita_current_user.email%></a>
+	    <a href="<%=send(:"destroy_#{lolita_current_user.class.to_s.downcase}_session_path")%>" class="button grey"><%=::I18n.t("lolita.shared.log_out")%></a>
+	  </nav>
+  <% end %>
 </header>

data/app/views/components/lolita/shared/_right_sidebar.html.erb

@@ -1,14 +1,14 @@
-<div class="secondary">
-  <div class="box">
-    <div class="boxtitle black">
-      <h1><%= t "lolita.tabs.save" %></h1>
-      <div class="arrow"></div>
-    </div>
-    <div class="save black">
-      <div class="last-save">
-        <%= resource.updated_at.strftime("#{t("lolita.tabs.last_save")}: %m/%d/%Y %H:%M ") if resource.respond_to?(:updated_at) && resource.updated_at %>
-      </div>
-      <button class="save-all"><%=::I18n.t("lolita.tabs.save")%></button>
-    </div>
-  </div>
+<div class="secondary">
+  <div class="box">
+    <div class="boxtitle black">
+      <h1><%= t "lolita.tabs.save" %></h1>
+      <div class="arrow"></div>
+    </div>
+    <div class="save black">
+      <div class="last-save">
+        <%= resource.updated_at.strftime("#{t("lolita.tabs.last_save")}: %m/%d/%Y %H:%M ") if resource.respond_to?(:updated_at) && resource.updated_at %>
+      </div>
+      <button class="save-all"><%=::I18n.t("lolita.tabs.save")%></button>
+    </div>
+  </div>
 </div>

data/app/views/layouts/lolita/application.html.erb

@@ -1,45 +1,45 @@
-<!doctype html>
-<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
-<!--[if lt IE 7 ]> <html class="no-js ie6" lang="en"> <![endif]-->
-<!--[if IE 7 ]>    <html class="no-js ie7" lang="en"> <![endif]-->
-<!--[if IE 8 ]>    <html class="no-js ie8" lang="en"> <![endif]-->
-<!--[if (gte IE 9)|!(IE)]><!-->
-<html class="no-js" lang="en">
-  <!--<![endif]-->
-  <head>
-    <meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-
-    <title>Lolita</title><meta name="description" content=""><meta name="author" content="">
-    <link rel="shortcut icon" href="/favicon.ico">
-
-    <%= stylesheet_link_tag "lolita/default","lolita/style" %>
-    <%= yield :style %>
-    
-     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
-     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
-    <script>
-      if(!window.jQuery){
-        document.write('<script src="/javascripts/jquery-1.6.min.js">\x3C/script>');
-        document.write('<script src="/javascripts/jquery-ui-1.8.13.min.js">\x3C/script>');
-      }
-    </script>
-    <%= javascript_include_tag "modernizr-1.7.min" %>
-    <%= javascript_include_tag "rails","lolita/tab","lolita/main","lolita/application" %>
-    <%= yield :script %>
-    <%= raw csrf_meta_tag %>
-  </head>
-  <body>
-    <%= render_component :"lolita/shared", :flash%>
-    <div id="container">
-      <%= render_component :"lolita/shared", :header %>
-      <div id="main" role="main">
-        <%= render_component :"lolita/navigation",:display,:tree=>Lolita::Navigation::Tree[:"left_side_navigation"] %>
-        <div id="content" class="<%= content_classes %>">
-          <%= yield %>
-        </div>
-      </div>
-      <footer>
-      </footer>
-    </div>
-  </body>
+<!doctype html>
+<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
+<!--[if lt IE 7 ]> <html class="no-js ie6" lang="en"> <![endif]-->
+<!--[if IE 7 ]>    <html class="no-js ie7" lang="en"> <![endif]-->
+<!--[if IE 8 ]>    <html class="no-js ie8" lang="en"> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!-->
+<html class="no-js" lang="en">
+  <!--<![endif]-->
+  <head>
+    <meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
+    <title>Lolita</title><meta name="description" content=""><meta name="author" content="">
+    <link rel="shortcut icon" href="/favicon.ico">
+
+    <%= stylesheet_link_tag "lolita/default","lolita/style" %>
+    <%= yield :style %>
+    
+     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
+     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
+    <script>
+      if(!window.jQuery){
+        document.write('<script src="/javascripts/jquery-1.6.min.js">\x3C/script>');
+        document.write('<script src="/javascripts/jquery-ui-1.8.13.min.js">\x3C/script>');
+      }
+    </script>
+    <%= javascript_include_tag "modernizr-1.7.min" %>
+    <%= javascript_include_tag "rails","lolita/tab","lolita/main","lolita/application" %>
+    <%= yield :script %>
+    <%= raw csrf_meta_tag %>
+  </head>
+  <body>
+    <%= render_component :"lolita/shared", :flash%>
+    <div id="container">
+      <%= render_component :"lolita/shared", :header %>
+      <div id="main" role="main">
+        <%= render_component :"lolita/navigation",:display,:tree=>Lolita::Navigation::Tree[:"left_side_navigation"] %>
+        <div id="content" class="<%= content_classes %>">
+          <%= yield %>
+        </div>
+      </div>
+      <footer>
+      </footer>
+    </div>
+  </body>
 </html>

data/app/views/lolita/info/index.html.erb

@@ -1,232 +1,232 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Lolita: Welcome aboard</title>
-    <style type="text/css" media="screen">
-      body {
-        margin: 0;
-        margin-bottom: 25px;
-        padding: 0;
-        background-color: #f0f0f0;
-        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
-        font-size: 13px;
-        color: #333;
-      }
-
-      h1 {
-        font-size: 28px;
-        color: #000;
-      }
-
-      a  {color: #03c}
-      a:hover {
-        background-color: #03c;
-        color: white;
-        text-decoration: none;
-      }
-
-
-      #page {
-        background-color: #f0f0f0;
-        width: 750px;
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-      }
-
-      #content {
-        float: left;
-        background-color: white;
-        border: 3px solid #aaa;
-        border-top: none;
-        padding: 25px;
-        width: 500px;
-      }
-
-      #sidebar {
-        float: right;
-        width: 175px;
-      }
-
-      #footer {
-        clear: both;
-      }
-
-
-      #header, #about, #getting-started {
-        padding-left: 75px;
-        padding-right: 30px;
-      }
-
-
-      #header {
-        background-image: url("images/lolita/plus.png");
-        background-repeat: no-repeat;
-        background-position: top left;
-        height: 64px;
-      }
-      #header h1, #header h2 {margin: 0}
-      #header h2 {
-        color: #888;
-        font-weight: normal;
-        font-size: 16px;
-      }
-
-
-      #about h3 {
-        margin: 0;
-        margin-bottom: 10px;
-        font-size: 14px;
-      }
-
-      #about-content {
-        background-color: #ffd;
-        border: 1px solid #fc0;
-        margin-left: -55px;
-        margin-right: -10px;
-      }
-      #about-content table {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        font-size: 11px;
-        border-collapse: collapse;
-      }
-      #about-content td {
-        padding: 10px;
-        padding-top: 3px;
-        padding-bottom: 3px;
-      }
-      #about-content td.name  {color: #555}
-      #about-content td.value {color: #000}
-
-      #about-content ul {
-        padding: 0;
-        list-style-type: none;
-      }
-
-      #about-content.failure {
-        background-color: #fcc;
-        border: 1px solid #f00;
-      }
-      #about-content.failure p {
-        margin: 0;
-        padding: 10px;
-      }
-
-
-      #getting-started {
-        border-top: 1px solid #ccc;
-        margin-top: 25px;
-        padding-top: 15px;
-      }
-      #getting-started h1 {
-        margin: 0;
-        font-size: 20px;
-      }
-      #getting-started h2 {
-        margin: 0;
-        font-size: 14px;
-        font-weight: normal;
-        color: #333;
-        margin-bottom: 25px;
-      }
-      #getting-started ol {
-        margin-left: 0;
-        padding-left: 0;
-      }
-      #getting-started li {
-        font-size: 18px;
-        color: #888;
-        margin-bottom: 25px;
-      }
-      #getting-started li h2 {
-        margin: 0;
-        font-weight: normal;
-        font-size: 18px;
-        color: #333;
-      }
-      #getting-started li p {
-        color: #555;
-        font-size: 13px;
-      }
-
-
-      #sidebar ul {
-        margin-left: 0;
-        padding-left: 0;
-      }
-      #sidebar ul h3 {
-        margin-top: 25px;
-        font-size: 16px;
-        padding-bottom: 10px;
-        border-bottom: 1px solid #ccc;
-      }
-      #sidebar li {
-        list-style-type: none;
-      }
-      #sidebar ul.links li {
-        margin-bottom: 5px;
-      }
-
-    </style>
-    <script type="text/javascript">
-      function about() {
-        info = document.getElementById('about-content');
-        if (window.XMLHttpRequest)
-          { xhr = new XMLHttpRequest(); }
-        else
-          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
-        xhr.open("GET","lolita/info/properties",false);
-        xhr.send("");
-        info.innerHTML = xhr.responseText;
-        info.style.display = 'block'
-      }
-    </script>
-  </head>
-  <body>
-    <div id="page">
-      <div id="sidebar">
-        <ul id="sidebar-items">
-          <li>
-            <h3>Browse the documentation</h3>
-            <ul class="links">
-              <li><a href="http://rdoc.info/github/ithouse/lolita/master/frames">Lolita API</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-
-      <div id="content">
-        <div id="header">
-          <h1>Welcome aboard</h1>
-          <h2>You&rsquo;re riding Lolita!</h2>
-        </div>
-
-        <div id="about">
-          <h3><a href="lolita/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
-          <div id="about-content" style="display: none"></div>
-        </div>
-
-        <div id="getting-started">
-          <h1>Getting started</h1>
-          <h2>Here&rsquo;s how to get rolling:</h2>
-
-          <ol>
-            <li>
-              <h2>Use <code>lolita_for</code> in config/routes.rb</h2>
-              <p>run it.</p>
-            </li>
-
-            <li>
-            <h2>Use <code>lolita</code> in your models</h2>
-              <p></p>
-            </li>
-
-          </ol>
-        </div>
-      </div>
-
-      <div id="footer">&nbsp;</div>
-    </div>
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Lolita: Welcome aboard</title>
+    <style type="text/css" media="screen">
+      body {
+        margin: 0;
+        margin-bottom: 25px;
+        padding: 0;
+        background-color: #f0f0f0;
+        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
+        font-size: 13px;
+        color: #333;
+      }
+
+      h1 {
+        font-size: 28px;
+        color: #000;
+      }
+
+      a  {color: #03c}
+      a:hover {
+        background-color: #03c;
+        color: white;
+        text-decoration: none;
+      }
+
+
+      #page {
+        background-color: #f0f0f0;
+        width: 750px;
+        margin: 0;
+        margin-left: auto;
+        margin-right: auto;
+      }
+
+      #content {
+        float: left;
+        background-color: white;
+        border: 3px solid #aaa;
+        border-top: none;
+        padding: 25px;
+        width: 500px;
+      }
+
+      #sidebar {
+        float: right;
+        width: 175px;
+      }
+
+      #footer {
+        clear: both;
+      }
+
+
+      #header, #about, #getting-started {
+        padding-left: 75px;
+        padding-right: 30px;
+      }
+
+
+      #header {
+        background-image: url("images/lolita/plus.png");
+        background-repeat: no-repeat;
+        background-position: top left;
+        height: 64px;
+      }
+      #header h1, #header h2 {margin: 0}
+      #header h2 {
+        color: #888;
+        font-weight: normal;
+        font-size: 16px;
+      }
+
+
+      #about h3 {
+        margin: 0;
+        margin-bottom: 10px;
+        font-size: 14px;
+      }
+
+      #about-content {
+        background-color: #ffd;
+        border: 1px solid #fc0;
+        margin-left: -55px;
+        margin-right: -10px;
+      }
+      #about-content table {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        font-size: 11px;
+        border-collapse: collapse;
+      }
+      #about-content td {
+        padding: 10px;
+        padding-top: 3px;
+        padding-bottom: 3px;
+      }
+      #about-content td.name  {color: #555}
+      #about-content td.value {color: #000}
+
+      #about-content ul {
+        padding: 0;
+        list-style-type: none;
+      }
+
+      #about-content.failure {
+        background-color: #fcc;
+        border: 1px solid #f00;
+      }
+      #about-content.failure p {
+        margin: 0;
+        padding: 10px;
+      }
+
+
+      #getting-started {
+        border-top: 1px solid #ccc;
+        margin-top: 25px;
+        padding-top: 15px;
+      }
+      #getting-started h1 {
+        margin: 0;
+        font-size: 20px;
+      }
+      #getting-started h2 {
+        margin: 0;
+        font-size: 14px;
+        font-weight: normal;
+        color: #333;
+        margin-bottom: 25px;
+      }
+      #getting-started ol {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #getting-started li {
+        font-size: 18px;
+        color: #888;
+        margin-bottom: 25px;
+      }
+      #getting-started li h2 {
+        margin: 0;
+        font-weight: normal;
+        font-size: 18px;
+        color: #333;
+      }
+      #getting-started li p {
+        color: #555;
+        font-size: 13px;
+      }
+
+
+      #sidebar ul {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #sidebar ul h3 {
+        margin-top: 25px;
+        font-size: 16px;
+        padding-bottom: 10px;
+        border-bottom: 1px solid #ccc;
+      }
+      #sidebar li {
+        list-style-type: none;
+      }
+      #sidebar ul.links li {
+        margin-bottom: 5px;
+      }
+
+    </style>
+    <script type="text/javascript">
+      function about() {
+        info = document.getElementById('about-content');
+        if (window.XMLHttpRequest)
+          { xhr = new XMLHttpRequest(); }
+        else
+          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
+        xhr.open("GET","lolita/info/properties",false);
+        xhr.send("");
+        info.innerHTML = xhr.responseText;
+        info.style.display = 'block'
+      }
+    </script>
+  </head>
+  <body>
+    <div id="page">
+      <div id="sidebar">
+        <ul id="sidebar-items">
+          <li>
+            <h3>Browse the documentation</h3>
+            <ul class="links">
+              <li><a href="http://rdoc.info/github/ithouse/lolita/master/frames">Lolita API</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+
+      <div id="content">
+        <div id="header">
+          <h1>Welcome aboard</h1>
+          <h2>You&rsquo;re riding Lolita!</h2>
+        </div>
+
+        <div id="about">
+          <h3><a href="lolita/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
+          <div id="about-content" style="display: none"></div>
+        </div>
+
+        <div id="getting-started">
+          <h1>Getting started</h1>
+          <h2>Here&rsquo;s how to get rolling:</h2>
+
+          <ol>
+            <li>
+              <h2>Use <code>lolita_for</code> in config/routes.rb</h2>
+              <p>run it.</p>
+            </li>
+
+            <li>
+            <h2>Use <code>lolita</code> in your models</h2>
+              <p></p>
+            </li>
+
+          </ol>
+        </div>
+      </div>
+
+      <div id="footer">&nbsp;</div>
+    </div>
+  </body>
+</html>