Merge branch 'master' into ldap

app/assets/javascripts/new_admin.js

@@ -11,3 +11,4 @@
 //= require jquery.tinyscrollbar.min
 //= require orbit-1.0
 //= require tinymce-jquery
+//= require tinymce_orbit

app/assets/javascripts/tinymce_orbit.js

@@ -0,0 +1,26 @@
+$(function() {
+  $('.tinymce_textarea').tinymce({
+    theme: 'advanced',
+        plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template",
+
+        // Theme options
+        theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
+        theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
+        theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
+        theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage",
+        theme_advanced_toolbar_location : "top",
+        theme_advanced_toolbar_align : "left",
+        theme_advanced_statusbar_location : "bottom",
+        theme_advanced_resizing : false,
+
+        // Skin options
+        skin : "o2k7",
+        skin_variant : "silver",
+
+        // Drop lists for link/image/media/template dialogs
+        template_external_list_url : "js/template_list.js",
+        external_link_list_url : "js/link_list.js",
+        external_image_list_url : "js/image_list.js",
+        media_external_list_url : "js/media_list.js"
+  });
+});

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

@@ -29,7 +29,7 @@
 		</div>
 	</td>
 	<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] %></td>
-	<td><%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) rescue ''%></td>
+	<td><%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin) rescue ''%></td>
 	<td><%= bulletin.postdate %></td>
 	<td><%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %></td>
 	<td>

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

@@ -146,7 +146,7 @@
 					<% @site_valid_locales.each do |locale| %>
 						<td>
 							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_area locale, :style=>"width:100%" %>
+							<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
 						</td>
 					<% end %>
 				<% end %>
@@ -158,7 +158,7 @@
 					<% @site_valid_locales.each do |locale| %>
 						<td>
 							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_area locale, :style=>"width:100%" %>
+							<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
 						</td>
 					<% end %>
 				<% end %>
@@ -286,11 +286,4 @@
 			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
 		});
 	</script>
-	<script type="text/javascript">
-	  $(function() {
-	    $('textarea').tinymce({
-	      theme: 'advanced'
-	    });
-	  });
-	</script>
 <% end %>

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

@@ -1,15 +1,3 @@
-<% content_for :secondary do %>
-<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
-<% end -%>
-
-<%= flash_messages %>
-
-<br />
-<br />
-<br />
-<br />
-<br />
-
 <ul>
 	<li>
   <b><%= t('announcement.category') %></b>

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

@@ -15,7 +15,7 @@
 			<% @site_valid_locales.each do |locale| %>
 				<td>
 					<%= I18nVariable.from_locale(locale) %>
-					<%= f.text_area locale, :style=>"width:100%" %>
+					<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
 				</td>
 			<% end %>
 		<% end %>
@@ -27,14 +27,3 @@
 	</div>
 
 </div>
-
-
-<% content_for :page_specific_javascript do %>
-	<script type="text/javascript">
-	  $(function() {
-	    $('textarea').tinymce({
-	      theme: 'advanced'
-	    });
-	  });
-	</script>
-<% end %>