[Logilogi-svn] SF.net SVN: logilogi:[1684] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1684] trunk
|
From: <wy...@us...> - 2010-02-05 07:50:15
|
Revision: 1684
http://logilogi.svn.sourceforge.net/logilogi/?rev=1684&view=rev
Author: wybow
Date: 2010-02-05 07:50:09 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
Simplified things further, title at bottom now
Modified Paths:
--------------
trunk/app/views/comments/_new.html.erb
trunk/app/views/logis/_edit.html.erb
trunk/config/locales/en.yml
trunk/public/javascripts/application.js
trunk/public/stylesheets/logilogi.css
Modified: trunk/app/views/comments/_new.html.erb
===================================================================
--- trunk/app/views/comments/_new.html.erb 2010-02-03 21:38:18 UTC (rev 1683)
+++ trunk/app/views/comments/_new.html.erb 2010-02-05 07:50:09 UTC (rev 1684)
@@ -24,7 +24,7 @@
<% render :layout => 'application/panel', :locals => {
:id => "submit"} do %>
- <label><%= t 'defaults.submit' %></label>
+ <label><%= t 'defaults.submit_label' %></label>
<%= form.submit t('defaults.submit'), : "tinyMCE.triggerSave();" +
" tinyMCE.execCommand('mceRemoveControl', false, 'logi_edit_body');" +
" $('logi_form').onsubmit()",
@@ -36,7 +36,7 @@
<% render :layout => 'application/panel', :locals => {
:id => 'link_perma_id'} do %>
- <label id="perma_link_label"><%= t 'v.comments.permanent_link' %></label>
+ <label id="perma_link_label"><%= t 'v.comments.permanent_link_label' %></label>
<%= text_field_tag 'perma_link', nil, :id => "perma_link",
:autocomplete => "off" %>
<%= observe_field 'perma_link', :url => {:controller => 'logis',
@@ -49,7 +49,7 @@
<% render :layout => 'application/panel', :locals => {
:id => "submit"} do %>
- <label><%= t 'defaults.submit' %></label>
+ <label><%= t 'defaults.submit_label' %></label>
<%= form.submit t('defaults.submit'),
: "$('logi_form').onsubmit()" %>
<%= cancel_button :url => logi_url(@logi) %>
Modified: trunk/app/views/logis/_edit.html.erb
===================================================================
--- trunk/app/views/logis/_edit.html.erb 2010-02-03 21:38:18 UTC (rev 1683)
+++ trunk/app/views/logis/_edit.html.erb 2010-02-05 07:50:09 UTC (rev 1684)
@@ -1,18 +1,18 @@
<% render :layout => 'logis/logi', :locals => {:id => "logi_edit"} do %>
- <label class="for_title"><%= t 'v.logis.title_label' %></label>
<%= hidden_field_tag 'logi[link_string]', '' %>
- <%= text_field_tag 'logi[title]', (logi_version.nil? ? nil : logi_version.title),
- :class => "logi_title", :id => "logi_edit_title",
- : "logiLogisOnChange(tinyMCE.getInstanceById('logi_edit_body')," +
- " $('logi_edit_title'), #{GlobalConfig.maximum_logi_version_size})",
- :tabindex => 98 %>
-
<div id="EditorDiv" style="visibility: hidden;">
<%= text_area_tag 'logi[body]',
(logi_version.nil? ? nil : logi_version.body),
:class => 'editable', :id => 'logi_edit_body' %>
</div>
+ <label class="for_title"><%= t 'v.logis.title_label' %></label>
+ <%= text_field_tag 'logi[title]', (logi_version.nil? ? nil : logi_version.title),
+ :class => "logi_title", :id => "logi_edit_title",
+ : "logiLogisOnChange(tinyMCE.getInstanceById('logi_edit_body')," +
+ " $('logi_edit_title'), #{GlobalConfig.maximum_logi_version_size})",
+ :tabindex => 99 %>
+
<% javascript_tag do -%>
logi_editor = new LogiEditor('logi_edit_body','EditorDiv','logi_edit_title',
<%= GlobalConfig.maximum_logi_version_size %>,
Modified: trunk/config/locales/en.yml
===================================================================
--- trunk/config/locales/en.yml 2010-02-03 21:38:18 UTC (rev 1683)
+++ trunk/config/locales/en.yml 2010-02-05 07:50:09 UTC (rev 1684)
@@ -512,7 +512,7 @@
existing_logi: "Existing logi"
new_logi: "New logi"
paste_perma_link: "Paste (Ctrl V) the permanent link to the logi you want to add."
- permanent_link: "Permanent link"
+ permanent_link_label: "Permanent link:"
external_links:
check_remove: "Check if these are indeed the external links you want to remove. Then submit."
click_crosses: "Click on the crosses of the external links you want to delete. This will move them to the deletion list."
Modified: trunk/public/javascripts/application.js
===================================================================
--- trunk/public/javascripts/application.js 2010-02-03 21:38:18 UTC (rev 1683)
+++ trunk/public/javascripts/application.js 2010-02-05 07:50:09 UTC (rev 1684)
@@ -177,12 +177,12 @@
theme: "advanced",
skin: "ll",
plugins: "llheading",
- theme_advanced_buttons1: "italic,sub,sup,bullist,numlist,image,charmap,separator,undo,redo,cut,copy,paste",
+ theme_advanced_buttons1: "italic,bullist,numlist,charmap,separator,undo,redo,cut,copy,paste",
theme_advanced_buttons2: "",
theme_advanced_buttons3: "",
- theme_advanced_buttons1_add_before : "h2",
+// theme_advanced_buttons1_add_before : "h2",
width: "446",
- height: "715", // also set in css
+ height: "515", // also set in css
init_instance_callback: logiLogisInitEditor(this.title_id,
this.hidden_div_id, this.textarea_id, this.maximum_logi_size),
editor_selector : "editable"
@@ -242,7 +242,7 @@
inst.onEvent.add(f);
inst.onExecCommand.add(f);
$(editor_id).style.visibility = "visible";
- $(textarea_id + '_ifr').setAttribute('tabindex', "99");
+ $(textarea_id + '_ifr').setAttribute('tabindex', "98");
$('length_warning').appendChild(document.createTextNode(""));
};
}
Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css 2010-02-03 21:38:18 UTC (rev 1683)
+++ trunk/public/stylesheets/logilogi.css 2010-02-05 07:50:09 UTC (rev 1684)
@@ -658,8 +658,11 @@
#insert_form input#external_link_url,
#insert_form input#external_link_text {
float: right;
- width: 24em;
+ width: 27em;
}
+#insert_form input#external_link_text {
+ margin-top: 0.5em;
+}
input#perma_link { /* also used for comments */
margin: 0.5em 0 0.5em 0;
float: left;
@@ -1056,19 +1059,21 @@
margin-right: 0.3em;
margin-top: 0.8em;
}
+.main label,
.blank label {
font-size: 1.1em;
font-weight: bold;
float: left;
color: #43497E;
}
+.main .main_column label,
.blank .main_column label {
font-size: 1.4em;
}
.blank label.behind {
float: none;
}
-.blank label.for_check {
+label.for_check {
margin-right: 0.5em;
line-height: 1.8em;
}
@@ -1136,10 +1141,10 @@
clear: both;
}
#logi_edit {
- height: 848px;
+ height: 638px;
}
#logi_edit .panel_content_padding {
- padding: 1em 1.1em 3em 1.1em;
+ padding: 1.5em 1.1em 2em 1.1em;
}
#logi_edit label.for_title {
margin-right: 1em;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|