Download as
Browse Code »

Commit 802a75f6ac80452f6210502ddbb712503e5b5287

Authored by LeandroNunes
1 parent 3f31c2a1
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem85: Putting tiny on form 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@763 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 24 additions and 24 deletions   Show diff stats
app/views/cms/_form.rhtml
  Diff comments   View file @802a75f
1 1
2 <%= javascript_include_tag 'cms' %> 2 <%= javascript_include_tag 'cms' %>
  3 +<%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>
  4 +<%= javascript_include_tag 'noosfero_tiny_mce.js' %>
  5 +<script>
  6 +tinyMCE.init({
  7 + mode : "textareas",
  8 + theme : "advanced",
  9 + theme_advanced_toolbar_location : "top",
  10 + theme_advanced_layout_manager: 'SimpleLayout',
  11 + theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,undo,redo,separator,formatselect,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code,separator,help",
  12 + theme_advanced_buttons2 : "",
  13 + theme_advanced_buttons3 : "",
  14 + apply_source_formatting : true,
  15 + language: <%= language.inspect %>,
  16 +});
  17 +</script>
  18 +
  19 +
  20 +
3 21
4 <%= error_messages_for :page %> 22 <%= error_messages_for :page %>
5 23
app/views/cms/edit.rhtml
  Diff comments   View file @802a75f
1 - <%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>  
2 - <%= javascript_include_tag 'noosfero_tiny_mce.js' %>  
3 -  
4 -<script>  
5 -tinyMCE.init({  
6 - mode : "textareas",  
7 - theme : "advanced",  
8 - theme_advanced_toolbar_location : "top",  
9 - theme_advanced_layout_manager: 'SimpleLayout',  
10 - theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,undo,redo,separator,formatselect,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code,separator,help",  
11 - theme_advanced_buttons2 : "",  
12 - theme_advanced_buttons3 : "",  
13 - apply_source_formatting : true,  
14 - language: <%= language.inspect %>,  
15 -});  
16 -</script>  
17 -  
18 -  
19 <h1> 1 <h1>
20 <%= _("Edit Page") %> 2 <%= _("Edit Page") %>
21 </h1> 3 </h1>
po/noosfero.pot
  Diff comments   View file @802a75f
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.3.0\n" 9 "Project-Id-Version: noosfero 0.3.0\n"
10 -"POT-Creation-Date: 2007-10-19 19:24-0300\n" 10 +"POT-Creation-Date: 2007-10-19 23:08-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
po/pt_BR/noosfero.po
  Diff comments   View file @802a75f
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 msgid "" 9 msgid ""
10 msgstr "" 10 msgstr ""
11 "Project-Id-Version: noosfero 0.3.0\n" 11 "Project-Id-Version: noosfero 0.3.0\n"
12 -"POT-Creation-Date: 2007-10-19 19:24-0300\n" 12 +"POT-Creation-Date: 2007-10-19 23:08-0300\n"
13 "PO-Revision-Date: 2007-10-19 21:25-0300\n" 13 "PO-Revision-Date: 2007-10-19 21:25-0300\n"
14 "Last-Translator: Rafael Tavares Bomfim <rafael@colivre.coop.br>\n" 14 "Last-Translator: Rafael Tavares Bomfim <rafael@colivre.coop.br>\n"
15 "Language-Team: \n" 15 "Language-Team: \n"
@@ -1534,8 +1534,8 @@ msgid &quot;&quot; @@ -1534,8 +1534,8 @@ msgid &quot;&quot;
1534 "a> functionality." 1534 "a> functionality."
1535 msgstr "" 1535 msgstr ""
1536 "O código que você está usando para mudança de senha não é válido. Por favor " 1536 "O código que você está usando para mudança de senha não é válido. Por favor "
1537 -"tente requerir a mudança de senha usando a funcionalidade <a href=\"%s\">\"Eu "  
1538 -"esqueci minha senha\"</a>." 1537 +"tente requerir a mudança de senha usando a funcionalidade <a href=\"%s\">"
  1538 +"\"Eu esqueci minha senha\"</a>."
1539 1539
1540 #: app/views/account/login.rhtml:4 app/views/account/forgot_password.rhtml:8 1540 #: app/views/account/login.rhtml:4 app/views/account/forgot_password.rhtml:8
1541 msgid "Username" 1541 msgid "Username"
@@ -1637,8 +1637,8 @@ msgid &quot;&quot; @@ -1637,8 +1637,8 @@ msgid &quot;&quot;
1637 "with a web address you can access to create a new password." 1637 "with a web address you can access to create a new password."
1638 msgstr "" 1638 msgstr ""
1639 "Para mudar sua senha, por favor preencha o formulário nesta tela usando o " 1639 "Para mudar sua senha, por favor preencha o formulário nesta tela usando o "
1640 -"seu username e o seu e-mail. Você receberá uma mensagem nesse endereço de "  
1641 -"e-mail com um endereço web que você pode acessar para criar uma senha nova." 1640 +"seu username e o seu e-mail. Você receberá uma mensagem nesse endereço de e-"
  1641 +"mail com um endereço web que você pode acessar para criar uma senha nova."
1642 1642
1643 #: app/views/account/forgot_password.rhtml:9 1643 #: app/views/account/forgot_password.rhtml:9
1644 msgid "E-mail" 1644 msgid "E-mail"