Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb

@@ -17,8 +17,8 @@
 			</tr>
 		</thead>
 		<% @bulletins.each do |post| %>
-			<% @widget_fields.each do |wf|  %>
 			<tr class="<%= cycle('odd', '')%>">
+			<% @widget_fields.each do |wf|  %>
 				<td>
 				<span class="<%= wf[1] %>">
 				<% if wf[1] == 'title' %>
@@ -26,7 +26,7 @@
 				<% elsif wf[1] == 'date' %>
 					<%= display_date(post.send(wf[0])) %>
 				<% elsif wf[1] == 'category' %>
-					<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").i18n_variable[I18n.locale] rescue nil %>
+					<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").title rescue nil %>
 				<% elsif wf[1] == 'img' %>
 					<div class="img app-pic"><%= image_tag(post.send(wf[0]).url) %></div>
 				<% elsif wf[1] == 'text' %>
@@ -49,8 +49,8 @@
 				<% end %>
 				</span>
 				</td>
-			</tr>
 			<% end %>
+			</tr>
 		<% end %>
 		</table>
 		
@@ -67,7 +67,7 @@
 		<ul class="newslist">
 		<% @bulletins.each do |post| %>
 			<li class="<%= cycle('odd', '')%>">
-				<div class="img app-pic"><%= image_tag(post.image.url) %></div>
+				<div class="img app-pic" style="width:50px; height:50px;"><%= image_tag(post.image.url) %></div>
 				
 				<% @widget_fields.each do |wf|  %>
 				<span class="<%= wf[1] %>">
@@ -76,7 +76,7 @@
 				<% elsif wf[1] == 'date' %>
 					<%= display_date(post.send(wf[0])) %>
 				<% elsif wf[1] == 'category' %>
-					<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").i18n_variable[I18n.locale] rescue nil %>
+					<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").title rescue nil %>
 				<% elsif wf[1] == 'text' %>
 					<%#= post.send("#{wf[0]}[#{I18n.locale}]").html_safe %>
 					<%= post.send("#{wf[0]}").html_safe %>
@@ -124,7 +124,7 @@
 					<% elsif wf[1] == 'date' %>
 						<%= display_date(post.send(wf[0])) %>
 					<% elsif wf[1] == 'category' %>
-						<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").i18n_variable[I18n.locale] rescue nil %>
+						<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").title rescue nil %>
 					<% elsif wf[1] == 'text' %>
 						<%#= post.send("#{wf[0]}[#{I18n.locale}]").html_safe %>
 						<%= post.send("#{wf[0]}").html_safe %>
@@ -174,7 +174,7 @@
 					<% elsif wf[1] == 'date' %>
 						<%= display_date(post.send(wf[0])) %>
 					<% elsif wf[1] == 'category' %>
-						<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").i18n_variable[I18n.locale] rescue nil %>
+						<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").title rescue nil %>
 					<% elsif wf[1] == 'text' %>
 						<%#= post.send("#{wf[0]}[#{I18n.locale}]").html_safe %>
 						<%= post.send("#{wf[0]}").html_safe %>
@@ -222,7 +222,7 @@
 				<% elsif wf[1] == 'date' %>
 					<%= display_date(post.send(wf[0])) %>
 				<% elsif wf[1] == 'category' %>
-					<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").i18n_variable[I18n.locale] rescue nil %>
+					<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").title rescue nil %>
 				<% elsif wf[1] == 'text' %>
 					<%#= post.send("#{wf[0]}[#{I18n.locale}]").html_safe %>
 					<%= post.send("#{wf[0]}").html_safe %>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb

@@ -1,4 +1,4 @@
-
+<%= stylesheet_link_tag "default_widget" %>
 <script type='text/javascript' src='/assets/jquery.mu.image.resize.js'></script>
 <script type='text/javascript' src='/assets/jquery.mu.image.resize.degsin.js'></script>
 

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb

@@ -6,11 +6,11 @@
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
 					<li><%= link_to t('archive_file_category.edit'), edit_panel_archive_back_end_archive_file_category_path(archive_file_category), :remote => true %></li>
-					<li><%= link_to t('archive_file_category.delete'), panel_archive_back_end_archive_file_category_path(archive_file_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+					<li><%= link_to t('archive_file_category.delete'), panel_archive_back_end_archive_file_category_path(archive_file_category), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 				</ul>
 			</div>
 		</td>
 		<% @site_valid_locales.each do |locale| %>
 		<td><%= archive_file_category.title_translations[locale] rescue nil %></td>
 		<% end %>
-	</tr>
+	</tr>

vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb

@@ -0,0 +1,27 @@
+<% if @current_category %>
+  <h1 class="h1"><%= @current_category.title + " " + t(:list_lower) %></h1>
+<% elsif @tag %>
+  <h1 class="h1"><%= @tag[I18n.locale] + " " + t(:list_lower) %></h1>
+<% else %>
+  <h1 class="h1"><%= t('list.link') %></h1>
+<% end %>
+
+<table class="table table-bordered">
+  <tbody>
+    <tr>
+      <th><%= t(:category) %></th>
+      <th><%= t(:name) %></th>
+    </tr>
+    <% @web_links.each do |post| %>
+      <tr>
+        <td><%= post.web_link_category.title rescue nil %></td>
+        <td>
+          <%= link_to post.title, post.url, {:target => '_blank', :title => post.title} %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%#= paginate @web_links, :params => {:inner => 'true'}, :remote => true %>
+<%= paginate @web_links, :params => {:inner => 'false'}, :remote => true %>

vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb

@@ -1,26 +1,3 @@
-<% if @current_category %>
-	<h1 class="h1"><%= @current_category.title + " " + t(:list_lower) %></h1>
-<% elsif @tag %>
-	<h1 class="h1"><%= @tag[I18n.locale] + " " + t(:list_lower) %></h1>
-<% else %>
-	<h1 class="h1"><%= t('list.link') %></h1>
-<% end %>
-
-<table class="table table-bordered">
-	<tbody>
-	  <tr>
-			<th><%= t(:category) %></th>
-			<th><%= t(:name) %></th>
-	  </tr>
-		<% @web_links.each do |post| %>
-		  <tr>
-				<td><%= post.web_link_category.title rescue nil %></td>
-				<td>
-					<%= link_to post.title, post.url, {:target => '_blank', :title => post.title} %>
-				</td>
-		  </tr>
-		<% end %>
-	</tbody>
-</table>
-
-<%= paginate @web_links, :params => {:inner => 'false'} %>
+<div id="web_link_widget">
+	<%= render 'index' %>
+</div>

vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.js.erb

@@ -0,0 +1 @@
+$('#web_link_widget').html("<%= j render 'index' %>")