lolita 3.1.5 → 3.1.6

data/Gemfile

@@ -15,12 +15,10 @@ end
 #gem 'cover_me', '>= 1.0.0.rc6', :group => :test
 gem "jeweler", "~> 1.5.2", :group=>:development
 group :test,:development do
-	gem "rspec", ">=2.2.0"
-	gem "rspec-rails"
+	gem "rspec", "~>2.6.0"
+	gem "rspec-rails","~>2.6.0"
 	gem "factory_girl"
 	gem 'ffaker'
-	# gem "rspec-cells"
-	#gem "sqlite3-ruby"
 	gem "ruby-debug19"
 	gem "cucumber-rails"
 	gem "capybara"

data/History.rdoc

@@ -1,4 +1,21 @@
-=== Version 3.1.5 / 2011-04
+=== Version 3.1.7 / 2011-
+* Enhancements
+
+=== Version 3.1.6 / 2011-05-19
+* Enhancements
+  * Hooks run all callbacks from superclasses and included modules too. (Arturs Meisters)
+  * Column now can be configured with attributes, updated :formatter (Gatis Tomsons)
+  * Titles and labels now user localization (Arturs Meisters)
+  * Latvian translations added (Arturs Meisters)
+  * Lolita don't use flash messages anymore, now messages goes through reponse header. (Arturs Meisters)
+  * jQuery updated to v1.6
+  * jQuery UI added v1.8.13, by default in layout
+  * TinyMCE initialization/configuration script moved to separate file (Rolands Bondars)
+
+* Bug fixes
+  * Restored TinyMCE 'util' folder, it is required for certain actions (Rolands Bondars)
+
+=== Version 3.1.5 / 2011-04-20
 * Changes
   * Moved from WillPaginate to Kaminari (Gatis Tomsons, Arturs Meisters)
   
@@ -121,4 +138,4 @@
 
 === Versions before 3.0.3
 Lolita 3 is completely different from previous versions and don't have any compability or architecture same as
-old versions. 
+old versions. 

data/README.rdoc

@@ -31,6 +31,9 @@ This will make routes like
   /lolita/posts
   /lolita/posts/1/edit
   /lolita/posts/new
+
+For more detailed usage read Usage[https://github.com/ithouse/lolita/wiki/Usage] at wiki.
+
 ===Add authorization to Lolita
 
 Easiest way to add authentication is with Devise. First install Devise as gem, than add to it your project.

data/VERSION

@@ -1 +1 @@
-3.1.5
+3.1.6

data/app/controllers/lolita/rest_controller.rb

@@ -42,9 +42,9 @@ class Lolita::RestController < ApplicationController
     self.run(:before_destroy)
     get_resource
     if self.resource && self.resource.destroy
-      flash.now[:notice] = I18n.t "lolita.shared.destroy_notice"
+      flash[:notice] = I18n.t "lolita.shared.destroy_notice"
     else
-      flash.now[:alert] = I18n.t "lolita.shared.destroy_alert"
+      flash[:alert] = I18n.t "lolita.shared.destroy_alert"
     end
     self.run(:after_destroy)
     redirect_to lolita_resources_path
@@ -55,6 +55,7 @@ class Lolita::RestController < ApplicationController
     respond_to do |format|
       format.html do
         build_response_for(:list,:page=>page)
+        show_index
       end
       format.json do
         render :json=>page
@@ -75,6 +76,10 @@ class Lolita::RestController < ApplicationController
     end
   end
   
+  def show_index
+    render "/lolita/rest/index"
+  end
+  
   def save_and_redirect
     respond_to do |format|
       if self.resource.save

data/app/views/components/lolita/configuration/column/_sort.html.erb

@@ -1,4 +1,4 @@
  <% param_options=params.reject{|k,v| [:controller,:action].include?(k)} %>
  <% options=param_options.merge(column.sort_options(params)) %>
  <% direction_indicator=column.currently_sorting?(params) && options[:sd].to_s=="desc" ? raw('&uArr;') : raw('&dArr;') %>
- <%= link_to raw("#{column.title} #{direction_indicator}"), lolita_resources_path(options) %>
+ <%= link_to raw("#{column.title } #{direction_indicator}"), lolita_resources_path(options) %>

data/app/views/components/lolita/configuration/columns/_last.html.erb

@@ -1,4 +1,4 @@
 <td class="tool-cell">
-  <%= link_to "Edit",edit_lolita_resource_path(:id=>record.id) %>
-  <%= link_to "Delete", lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
+  <%= link_to I18n.t("lolita.shared.edit"),edit_lolita_resource_path(:id=>record.id) %>
+  <%= link_to I18n.t("lolita.shared.delete"), lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
 </td>

data/app/views/components/lolita/configuration/field/string/text/_display.html.erb

@@ -1,23 +1,7 @@
 <% if @textarea_component_include_tinymce_once.nil? %>
   <% content_for :script do %>
     <%= javascript_include_tag "tinymce/jquery.tinymce" %>
-    <script type="text/javascript">
-      function load_tinymce(){
-        $("textarea[data-simple!=true]").tinymce({
-          script_url: "/javascripts/tinymce/tiny_mce.js",
-          theme: "advanced",
-          skin: "cirkuit",
-          mode: "textareas",
-          theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect,|,link,unlink,image,code",
-          theme_advanced_buttons2 : "",
-          theme_advanced_buttons3 : "",
-          theme_advanced_toolbar_location: "top",
-          theme_advanced_toolbar_align: "left",
-          // theme_advanced_statusbar_location : "bottom",
-          theme_advanced_resizing: true
-        });
-      }
-    </script>
+		<%= javascript_include_tag "tinymce_config.js" %>
   <% end %>
 <% end %>
 
@@ -31,4 +15,4 @@
     )
   </script>
 <% end %>
-<% @textarea_component_include_tinymce_once = "done" %>
+<% @textarea_component_include_tinymce_once = "done" %>

data/app/views/components/lolita/configuration/list/_new_resource.html.erb

@@ -1,4 +1,4 @@
 <a href="<%= new_lolita_resource_path%>" class="create">
-  <%= I18n.t("lolita.list.add_new",:name=>resource_name) %>
+  <%= I18n.t("lolita.list.add_new",:name=>resource_class.human_name.downcase) %>
   <%= image_tag "lolita/plus.png", :alt=>"+" %>
 </a>

data/app/views/components/lolita/configuration/list/_title.html.erb

@@ -1,5 +1,5 @@
 <div class="boxtitle">
-  <h1 class="black"><%= resource_name.capitalize %></h1>
+  <h1 class="black"><%= resource_class.human_name(:count=>2) %></h1>
   <div class="arrow">
   </div>
 </div>

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

@@ -1,4 +1,3 @@
-<%= render_component :"lolita/shared", :flash, :flash=>flash %>
 <%= render_component :"lolita/shared", :right_sidebar %>
 
 <% #error messages here not necessary, printing full messages moved to :"lolita/tab" component %>

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

@@ -16,14 +16,18 @@ end %>
   <%tree.branches.each do |branch| 
      if branch.object.is_a?(Lolita::Mapping) 
        active=if self.respond_to?(:resource_class)
-          branch.object.to==resource_class
-        else
-          branch.options[:url]==request.path
+          branch.object ? branch.object.to==resource_class : false
         end
-     else  
-       active=branch.self_with_children.detect{|b| b.options[:url]==request.path}
      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] || "#" %>

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

@@ -1,13 +1,5 @@
-<div id="flash" style="display:none">
-  <%= flash[:notice] if flash[:notice] %>
-  <%= flash[:alert]  if flash[:alert] %>
+<div id="flash" style="display:block">
+  <% if local_assigns[:message] %>
+    <%= message %>
+  <% end %>
 </div>
-
-<% if request.xhr? && (flash[:notice] || flash[:alert]) %>
-  <script>
-    $("#flash").slideDown("fast");
-    setTimeout(function() { 
-      $("#flash").slideUp("fast") 
-    }, 10000); //wait 10 seconds and then slide up
-  </script>
-<% end%>

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

@@ -14,10 +14,14 @@
 
     <%= stylesheet_link_tag "lolita/default","lolita/style" %>
     <%= yield :style %>
-     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js">
-    </script>
+    
+     <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>
-      window.jQuery || document.write('<script src="/javascripts/jquery-1.5.1.min.js">\x3C/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" %>
@@ -25,7 +29,7 @@
     <%= raw csrf_meta_tag %>
   </head>
   <body>
-
+    <%= render_component :"lolita/shared", :flash%>
     <div id="container">
       <%= render_component :"lolita/shared", :header %>
       <div id="main" role="main">

data/config/locales/default/lv.yml

@@ -0,0 +1,181 @@
+# Latvian translations for Ruby on Rails
+# by Kaspars Bankovskis (kaspars@kei.lv)
+
+lv:
+  date:
+    formats:
+      default: "%d.%m.%Y."
+      short: "%e. %B"
+      long: "%Y. gada %e. %B"
+
+    day_names: [svētdiena, pirmdiena, otrdiena, trešdiena, ceturtdiena, piektdiena, sestdiena]
+    abbr_day_names: [Sv., P., O., T., C., Pk., S.]
+    month_names: [~, janvārī, februārī, martā, aprīlī, maijā, jūnijā, jūlijā, augustā, septembrī, oktobrī, novembrī, decembrī]
+    abbr_month_names: [~, Janv, Febr, Marts, Apr, Maijs, Jūn, Jūl, Aug, Sept, Okt, Nov, Dec]
+    order:
+      - :year
+      - :month
+      - :day
+
+  time:
+    formats:
+      default: "%Y. gada %e. %B, %H:%M"
+      short: "%d.%m.%Y., %H:%M"
+      long: "%Y. gada %e. %B, %H:%M:%S"
+
+    am: "priekšpusdiena"
+    pm: "pēcpusdiena"
+
+  datetime:
+    distance_in_words:
+      half_a_minute: "pusminūte"
+      less_than_x_seconds:
+        one: "mazāk par vienu sekundi"
+        other: "mazāk par %{count} sekundēm"
+      x_seconds:
+        one: "1 sekunde"
+        other: "%{count} sekundes"
+      less_than_x_minutes:
+        one: "mazāk par vienu minūti"
+        other: "mazāk par %{count} minūtēm"
+      x_minutes:
+        one: "1 minūte"
+        other: "%{count} minūtes"
+      about_x_hours:
+        one: "apmēram 1 stunda"
+        other: "apmēram %{count} stundas"
+      x_days:
+        one: "1 diena"
+        other: "%{count} dienas"
+      about_x_months:
+        one: "apmēram 1 mēnesis"
+        other: "apmēram %{count} mēneši"
+      x_months:
+        one: "1 mēnesis"
+        other: "%{count} mēneši"
+      about_x_years:
+        one: "apmēram 1 gads"
+        other: "apmēram %{count} gadi"
+      over_x_years:
+        one: "vairāk kā gads"
+        other: "vairāk kā %{count} gadi"
+      almost_x_years:
+        one:   "gandrīz 1 gads"
+        other: "gandrīz %{count} gadi"
+    prompts:
+      second: "sekunde"
+      minute: "minūte"
+      hour: "stunda"
+      day: "diena"
+      month: "mēnesis"
+      year: "gads"
+
+  number:
+    format:
+      precision: 2
+      separator: ','
+      delimiter: '.'
+      significant: false
+      strip_insignificant_zeros: false
+
+    currency:
+      format:
+        unit: 'LVL'
+        format: '%u %n'
+        separator: ","
+        delimiter: "."
+        precision: 2
+        significant: false
+        strip_insignificant_zeros: false
+
+    percentage:
+      format:
+        delimiter: ""
+
+    precision:
+      format:
+        delimiter: ""
+
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+        significant: false
+        strip_insignificant_zeros: false
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Baits"
+            other: "Baiti"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+      decimal_units:
+        format: "%n %u"
+        units:
+          unit: ""
+          thousand: Tūkstotis
+          million: Miljons
+          billion: Biljons
+          trillion: Triljons
+          quadrillion: Kvadriljons
+
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " un "
+      last_word_connector: " un "
+
+    select:
+      prompt: "Lūdzu izvēlies"
+
+  helpers:
+    select:
+      prompt: "Lūdzu izvēlies"
+
+    submit:
+      create: 'Izveidot %{model}'
+      update: 'Atjaunināt %{model}'
+      submit: 'Saglabāt %{model}'
+
+  errors:
+    format: "%{attribute} %{message}"
+    messages: &errors_messages
+        inclusion: "nav iekļauts sarakstā"
+        exclusion: "nav pieejams"
+        invalid: "nav derīgs"
+        confirmation: "nesakrīt ar apstiprinājumu"
+        accepted: "ir jāpiekrīt"
+        empty: "ir jābūt aizpildītam"
+        blank: "ir jābūt aizpildītam"
+        too_long: "ir par garu (maksimums ir %{count} zīmes)"
+        too_short: "ir par īsu (minimums ir %{count} zīmes)"
+        wrong_length: "ir nepareizs garums (jābūt %{count} zīmēm)"
+        taken: "ir jau aizņemts"
+        not_a_number: "nav skaitlis"
+        not_an_integer: "ir jābūt veselam skaitlim"
+        greater_than: "ir jābūt lielākam par %{count}"
+        greater_than_or_equal_to: "ir jābūt lielākam vai vienādam ar %{count}"
+        equal_to: "ir jābūt vienādam ar %{count}"
+        less_than: "ir jābūt mazākam par %{count}"
+        less_than_or_equal_to: "ir jābūt mazākam vai vienādam ar %{count}"
+        odd: "ir jābūt nepāra skaitlim"
+        even: "ir jābūt pāra skaitlim"
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "Dēļ 1 kļūdas šis %{model} netika saglabāts"
+          other:  "Dēļ %{count} kļūdām šis %{model} netika saglabāts"
+        body: "Problēmas ir šajos ievades laukos:"
+
+      messages:
+        taken: "ir jau aizņemts"
+        record_invalid: "Pārbaude neizdevās: %{errors}"
+        <<: *errors_messages
+
+      full_messages:
+        format: "%{attribute} %{message}"

data/config/locales/en.yml

@@ -4,10 +4,15 @@ en:
       save_notice: Successfully saved.
       save_alert: Save did not succeed.
       log_out: Log out
+      edit: Edit
+      delete: Delete
     tabs:
       last_save: Last saved
       save: Save
       save_all: Save all
+      titles:
+        default: Default
+        content: Content
     list:
       add_new: Add new %{name}
       confirm: Are you sure you want to delete record?

data/config/locales/lv.yml

@@ -0,0 +1,21 @@
+lv:
+  lolita:
+    shared:
+      save_notice: Veiksmīgi saglabāts.
+      save_alert: Saglabāšana neizdevās.
+      log_out: Atteikties
+      edit: Edit
+      delete: Delete
+    tabs:
+      last_save: Pēdējā saglabāšana
+      save: Saglabāt
+      save_all: Saglabāt visu
+      titles:
+        default: "Noklusētais"
+        content: "Saturs"
+    list:
+      add_new: Pievienot jaunu %{name}
+      confirm: "Vai esat pārliecināts, ka vēlaties dzēst ierakstu?"
+    filter:
+      apply_button: Pielietot
+      include_blank_by_title: " -- Filtrēt pēc %{title} -- "