tr8n 3.0.5 → 3.1.1

data/app/views/tr8n/admin/language/lb_value_map.html.erb

@@ -1,42 +1,46 @@
-<%= form_for(@map, :as => :map, :url => {:action => :update_value_map}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
-  <%= hidden_field_tag :map_id, @map.id %>
-  
-  <h2><%=tra("Language Case Values")%></h2>
-  <table cellpadding="0" celspacing="0">
-      <tr style="border:1px dotted #ccc; background-color:#FDFFF0;">
-          <th style="padding:2px; width:20%; vertical-align:middle">
-              <%=tra("Keyword:")%>
-          </th>
-          <td style="padding:2px;">
-              <%= form.text_field :key, :style=>"width:100%; border:1px solid red;" %>
-          </td>
-      </tr>
-			
-			<tr>
-				<td colspan="2" style="padding-bottom:5px;">&nbsp;</td>
-			</tr>	
-			
-      <% tr8n_current_language.cases.each do |lcase| %>
-      <tr>
-          <th style="padding:2px;">
-              <%=lcase.native_name%>:
-          </th>
-          <td style="padding:2px;">
-              <%= text_field_tag "map[map][#{lcase.keyword}]", @map.implied_value_for(lcase.keyword), :style=>"width:100%;" %>
-							<div style="color:#ccc;">
-							 <%=lcase.description%>
-							</div>
-          </td>
-      </tr>
-      <% end %>
-			
-  </table>
 
-  <div style="text-align:center;padding-top:10px;">
-	    <button type="submit" class="translator_btn translator_submit_btn" onClick="Tr8n.Effects.submit('tr8n_form'); return false;">
-	        <span><%=tra("Save")%></span>
-	    </button>
-			
-     <%=link_to_function(tra("close", "Tr8n lightbox close button"), "tr8nLightbox.hide()", :class => "tr8n_cancel_link") %>
-	</div>
-<% end %>
+
+<div class="inner">
+    <div class="hd">
+        <div style="float:right;">
+            <%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();") %>
+        </div>
+        Language Case Values
+    </div>
+    <div class="bd">
+        <%= form_for(@map, :as => :map, :url => {:action => :update_value_map}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
+        <%= hidden_field_tag :map_id, @map.id %>
+        <table cellpadding="0" celspacing="0">
+            <tr style="border:1px dotted #ccc; background-color:#FDFFF0;">
+                <th style="padding:2px; width:20%; vertical-align:middle">
+                    <%=tra("Keyword:") %>
+                </th>
+                <td style="padding:2px;">
+                    <%= form.text_field :key, :style=>"width:100%; border:1px solid red;" %>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" style="padding-bottom:5px;">
+                    &nbsp;
+                </td>
+            </tr>
+            <% tr8n_current_language.cases.each do |lcase| %>
+            <tr>
+                <th style="padding:2px;">
+                    <%=lcase.native_name %>:
+                </th>
+                <td style="padding:2px;">
+                    <%= text_field_tag "map[map][#{lcase.keyword}]", @map.implied_value_for(lcase.keyword), :style=>"width:100%;" %>
+                    <div style="color:#ccc;">
+                        <%=lcase.description %>
+                    </div>
+                </td>
+            </tr>
+            <% end %>
+        </table>
+        <% end %>
+    </div>
+    <div class="ft">
+        <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
+    </div>
+</div>

data/app/views/tr8n/admin/translation_key/comments.html.erb

@@ -33,7 +33,7 @@
   ]) %>
 <% end %>
 
-<%= will_filter_actions_bar_tag(@keys, [
+<%= will_filter_actions_bar_tag(@comments, [
   ['Delete Selected Comments', 'deleteSelectedComments()'] 
 ]) %>
 

data/app/views/tr8n/admin/translation_key/index.html.erb

@@ -26,7 +26,7 @@
 	  [:verified_at, lambda{|key| key.verified_at}, 'padding:5px;text-align:right;'],
 	  [:actions, lambda{|key|
 	    html = []
-	    html << link_to_function("Update", "tr8nLightbox.show('/tr8n/admin/translation_key/lb_update?key_id=#{key.id}', {height:250})")
+	    html << link_to_function("Update", "tr8nLightbox.show('/tr8n/admin/translation_key/lb_update?key_id=#{key.id}', {height:280})")
 	    html << link_to("Delete", {:action => :delete, :key_id => key.id}, {:confirm => "Are you sure you want to delete this key?"})
 	    html.join(' | ').html_safe
 	  }, 'padding:5px;text-align:right;white-space:nowrap;']

data/app/views/tr8n/admin/translation_key/lb_merge.html.erb

@@ -1,9 +1,17 @@
+<div class="inner">
+    <div class="hd">
+        <div style="float:right;">
+            <%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();") %>
+        </div>
+        Merging Translation Keys
+    </div>
+    <div class="bd">
+
 <%= form_for(@key, :as => :translation_key, :url => {:action => :merge}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
   <%= form.hidden_field :id %>
   <%= hidden_field_tag :keys, @keys.collect{|key| key.id}.join(',') %>
   <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
   
-  <h2>Merging Translation Keys</h2>
 	<div style="background-color:#f1f4fa; padding:5px; max-height:120px; overflow:auto; margin-bottom: 10px; border: 1px solid #ccc;">
 		<table style="width:100%">
 			<% @keys.each_with_index do |key, index| %> 
@@ -37,7 +45,11 @@
       </tr>
   </table>
   
-  <div><i>Note: merging translation keys will join all of the translations for each language and unlock the merged key.</i></div>
+  <div><em>Note: merging translation keys will join all of the translations for each language and unlock the merged key.</em></div>
 
-  <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
 <% end %>
+    </div>
+    <div class="ft">
+        <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
+    </div>
+</div>

data/app/views/tr8n/admin/translation_key/lb_update.html.erb

@@ -1,44 +1,54 @@
-<%= form_for(@key, :as => :translation_key, :url => {:action => :update}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
-  <%= form.hidden_field :id %>
-  <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
-  
-  <h2><%=tra("Translation Key Details")%></h2>
-  <table class="admin_table">
-      <tr>
-          <th>
-              <%=tra("Access Key:")%>
-          </th>
-          <td>
-              <%=@key.key%>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              <%=tra("Translations:")%>
-          </th>
-          <td>
-              <%=@key.translations.size%>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              <%=tra("Label:")%>
-          </th>
-          <td>
-              <%= form.text_field :label, :style=>"width:99%;" %>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              <%=tra("Description:")%>
-          </th>
-          <td>
-              <%= form.text_field :description, :style=>"width:99%;" %>
-          </td>
-      </tr>
-  </table>
-  
-	<div><i>Note: changing translation key may invalidate the translations. Don't forget to change the code to reflect the new label and description. Otherwise the lookup will fail and a new key will be registered.</i></div>
-
-  <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
-<% end %>
+<div class="inner">
+    <div class="hd">
+        <div style="float:right;">
+            <%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();") %>
+        </div>
+        Translation Key Details
+    </div>
+    <div class="bd">
+        <%= form_for(@key, :as => :translation_key, :url => {:action => :update}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
+        <%= form.hidden_field :id %>
+        <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
+        <table class="admin_table">
+            <tr>
+                <th>
+                    <%=tra("Access Key:") %>
+                </th>
+                <td>
+                    <%=@key.key %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    <%=tra("Translations:") %>
+                </th>
+                <td>
+                    <%=@key.translations.size %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    <%=tra("Label:") %>
+                </th>
+                <td>
+                    <%= form.text_field :label, :style=>"width:99%;" %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    <%=tra("Description:") %>
+                </th>
+                <td>
+                    <%= form.text_field :description, :style=>"width:99%;" %>
+                </td>
+            </tr>
+        </table>
+        <div>
+            <em>Note: changing translation key may invalidate the translations. Don't forget to change the code to reflect the new label and description. Otherwise the lookup will fail and a new key will be registered.</em>
+        </div>
+        <% end %>
+    </div>
+    <div class="ft">
+        <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
+    </div>
+</div>

data/app/views/tr8n/admin/translation_key/locks.html.erb

@@ -35,7 +35,7 @@
   ]) %>
 <% end %>
 
-<%= will_filter_actions_bar_tag(@keys, [
+<%= will_filter_actions_bar_tag(@locks, [
   ['Delete Selected Locks', 'deleteSelectedLocks()'] 
 ]) %>
 

data/app/views/tr8n/admin/translator/lb_register.html.erb

@@ -1,18 +1,27 @@
-<%= form_for(@translator, :as => :translator, :url => {:action => :register}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
-  <%= form.hidden_field :id %>
-  <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
-  
-  <h2>User Translator Registration</h2>
-  <table class="admin_table">
-      <tr>
-          <th>
-              <%= Tr8n::Config.site_info[:user_info][:class_name] %> Id:
-          </th>
-          <td>
-              <%= form.text_field :user_id, :style=>"width:100%;" %>
-          </td>
-      </tr>
-  </table>
-
-  <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
-<% end %>
+<div class="inner">
+    <div class="hd">
+        <div style="float:right;">
+            <%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();") %>
+        </div>
+        User Translator Registration
+    </div>
+    <div class="bd">
+        <%= form_for(@translator, :as => :translator, :url => {:action => :register}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
+        <%= form.hidden_field :id %>
+        <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
+        <table class="admin_table">
+            <tr>
+                <th>
+                    <%= Tr8n::Config.site_info[:user_info][:class_name] %>Id:
+                </th>
+                <td>
+                    <%= form.text_field :user_id, :style=>"width:99%;" %>
+                </td>
+            </tr>
+        </table>
+        <% end %>
+    </div>
+    <div class="ft">
+      <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>     
+    </div>
+</div>

data/app/views/tr8n/awards/_list.html.erb

@@ -1,28 +1,28 @@
 <table style="width:100%;" cellpadding="5">
-  <tr style="border-bottom: 1px solid black;">
-    <th style="width:80px;color:grey;"><%=tra('Award', 'Awards section header')%></th>
-    <th style="width:200px;color:grey;"><%=tra('Name', 'Awards section header')%></th>
-    <th style="text-align:right;color:grey;"><%=tra('Total Translations', 'Awards section header')%></th>
-    <th style="text-align:right;color:grey;"><%=tra('Total Votes', 'Awards section header')%></th>
+  <tr style="border-bottom: 1px solid #ccc;">
+    <th style="width:80px;color:grey;padding:5px;"><%=tra('Award', 'Awards section header')%></th>
+    <th style="width:200px;color:grey;padding:5px;"><%=tra('Name', 'Awards section header')%></th>
+    <th style="text-align:right;color:grey;padding:5px;"><%=tra('Total Translations', 'Awards section header')%></th>
+    <th style="text-align:right;color:grey;padding:5px;"><%=tra('Total Votes', 'Awards section header')%></th>
   </tr>
   
   <% metrics.each_with_index do |tm, index| %>
     <% style = "border-bottom: 1px dotted #ccc;" unless metrics.last == tm %>
     <tr style="<%=style%>">
-      <td>
+      <td style="padding:5px;">
         <% if show_medals %> 
           <% if index == 0 %>
-            <%=image_tag("/tr8n/images/medals/gold.png", :style => "height:60px", :title => trla('Gold Medal', 'Awards section header'))%>
+            <%=image_tag("tr8n/medals/gold.png", :style => "height:60px", :title => trla('Gold Medal', 'Awards section header'))%>
           <% elsif index == 1 %>
-            <%=image_tag("/tr8n/images/medals/silver.png", :style => "height:60px", :title => trla('Silver Medal', 'Awards section header'))%>
+            <%=image_tag("tr8n/medals/silver.png", :style => "height:60px", :title => trla('Silver Medal', 'Awards section header'))%>
           <% elsif index == 2 %>
-            <%=image_tag("/tr8n/images/medals/bronze.png", :style => "height:60px", :title => trla('Bronze Medal', 'Awards section header'))%>
+            <%=image_tag("tr8n/medals/bronze.png", :style => "height:60px", :title => trla('Bronze Medal', 'Awards section header'))%>
           <% end %>
         <% else %>
-            <%=image_tag("/tr8n/images/medals/runner.png", :style => "height:60px", :title => trla('Runner-Up', 'Awards section header'))%>
+            <%=image_tag("tr8n/medals/runner.png", :style => "height:60px", :title => trla('Runner-Up', 'Awards section header'))%>
         <% end %>  
       </td>
-      <td>
+      <td style="padding:5px;">
         <table>
           <tr>
             <td style="vertical-align:top;padding:5px;">

data/app/views/tr8n/awards/index.html.erb

@@ -20,7 +20,7 @@
 	  <% end %>  
 	</div>
 	
-	<div class="section_box colored">
+	<div class="section grey">
 	  <%= render(:partial => 'list', :locals => {:metrics => @leaders, :show_medals => true}) %>  
 	</div>
 	

data/app/views/tr8n/common/_flashes.html.erb

@@ -1,35 +1,77 @@
 <style>
+.flash_notice {
+  background-color: #f1ffed;
+  border: 1px #a3f58a solid;
+  color: #1e7b21;
+  padding: 7px 10px;
+  margin-left:10px;
+  margin-right:10px;
+  font-weight:bold;
+  border-radius: 5px 5px 5px 5px;
+  border-width: 1px 1px 2px 1px;
+	margin-bottom:10px;
+} 
+ 
 .flash_error {
   background-color: #ffeded;
   border: 1px #f58a8a solid;
-  border-left:none;
-  border-right:none;
-  color:#b60e0e;
+  color: #b60e0e;
   padding: 7px 10px;
-  margin:10px auto 20px auto;
+  margin-left:10px;
+  margin-right:10px;
   font-weight:bold;
+  border-radius: 5px 5px 5px 5px;
+  border-width: 1px 1px 2px 1px;
+	margin-bottom:10px;
 }
 
-.flash_notice {
-  background-color: #f1ffed;
-  border: 1px #a3f58a solid;
-  border-left:none;
-  border-right:none;
-  color:#1e7b21;
+.flash_warning {
+  border: 1px #f58a8a solid;
+  color: #b60e0e;
   padding: 7px 10px;
-  margin:10px auto 20px auto;
+  margin-left:10px;
+  margin-right:10px;
   font-weight:bold;
-}  
+  border-radius: 5px 5px 5px 5px;
+  border-width: 1px 1px 2px 1px;
+  border-color: #DDDD99;
+  background-color:LightYellow;
+	margin-bottom:10px;
+}
 </style>
 
+
 <% if flash[:trfn] %>
-  <div class="flash_notice"><%= flash[:trfn] %></div>
-	<% flash[:trfn] = nil %>
+   <div class="flash_notice" id="flash_notice">
+   	<div style="float:right">
+   		<%=link_to_function(image_tag("tr8n/close.gif"), "Tr8n.Effects.hide('flash_notice');") %>
+   	</div>
+   	<%= image_tag("tr8n/checkmark.png", :style=>"height:20px;margin-right:10px;")%> 
+   	<%= flash[:trfn] %>
+  </div>
+   <%flash[:trfn] = nil%>
 <% end %>
 
 <% if flash[:trfe] %>
-  <div class="flash_error"><%= flash[:trfe] %></div>
-	<% flash[:trfe] = nil %>
+   <div class="flash_error" id="flash_error">
+     <div style="float:right">
+       <%=link_to_function(image_tag("tr8n/close.gif"), "Tr8n.Effects.hide('flash_error');") %>
+     </div>
+     <%= image_tag("tr8n/error.png", :style=>"height:20px;margin-right:10px;")%> 
+   	<%= flash[:trfe] %>
+	</div>
+	<%flash[:trfe] = nil%>
+<% end %>
+
+<% if flash[:trfw] %>
+   <div class="flash_warning" id="flash_warning">
+     <div style="float:right">
+       <%=link_to_function(image_tag("tr8n/close.gif"), "Tr8n.Effects.hide('flash_warning');") %>
+     </div>
+		<%=image_tag("tr8n/warning.png", :style=>"height:25px;margin-right:10px") %> 
+   	<%= flash[:trfw] %>
+	</div>
+	<%flash[:trfw] = nil%>
 <% end %>
 
 <noscript>