Merge branch 'design_team' into ldap

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb

@@ -12,5 +12,4 @@
 		<% @site_valid_locales.each do |locale| %>
 		<td><%= bulletin_category.i18n_variable[locale] rescue nil %></td>
 		<% end %>
-		<td><%= bulletin_category.display %></td>
 	</tr>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb

@@ -8,7 +8,6 @@
 			<% @site_valid_locales.each do |locale| %>
 			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 			<% end %>
-			<th class="span1-2"><%= t('bulletin_category.display') %></th>
 		</tr>
 	</thead>
 	<tbody>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -50,7 +50,7 @@
 				<div class="control-group">
 					<label class="control-label">Start</label>
 					<div class="controls">
-						<%= f.date_select :postdate, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %>				
+						<%= f.date_select :postdate, {:use_month_numbers => true, :order => [:day, :month, :year] }, {:class => 'input-small'} %>				
 					</div>
 				</div>
 				<div class="control-group">
@@ -144,14 +144,16 @@
 			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
 			
 			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<%# @site_valid_locales.each_with_index do |locale, i| %>
+				<% site_valid_locales_default_head.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
 			
 			<div class="tab-content">
 			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
+				<%# @site_valid_locales.each_with_index do |locale, i| %>
+				<% site_valid_locales_default_head.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 

vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb

@@ -5,7 +5,7 @@ class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendControll
 
   def index
 	
-	@page_contexts = PageContext.where(:archived => false).desc(:updated_at)
+	@page_contexts = PageContext.where(:archived => false).desc(:updated_at).page(params[:page]).per(10)
 
     respond_to do |format|
       format.html # index.html.erb

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb

@@ -17,4 +17,6 @@
 	</tbody>
 </table>
 
+<%= paginate @page_contexts %>
+
 

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb

@@ -7,7 +7,8 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
   
 	get_categorys(params[:web_link_category_id])
 	
-	@web_links = WebLink.search(params[:category_id])
+	# @web_links = WebLink.search(params[:category_id])
+	@web_links = WebLink.all.page(params[:page]).per(10)
 	
 	get_tags
 

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

@@ -19,3 +19,5 @@
 	</tbody>
 </table>
 
+<%= paginate @web_links %>
+