[Logilogi-svn] SF.net SVN: logilogi:[1734] trunk

Revision: 1734
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1734&view=rev
Author:   wybow
Date:     2010-06-25 18:55:24 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
Fixed last few IE-bugs

Modified Paths:
--------------
    trunk/app/views/comments/_new.html.erb
    trunk/app/views/logi_inserts/new.html.erb
    trunk/app/views/logis/_edit.html.erb
    trunk/app/views/tags/_edit.html.erb
    trunk/public/stylesheets/ie.css

Modified: trunk/app/views/comments/_new.html.erb
===================================================================
--- trunk/app/views/comments/_new.html.erb	2010-06-25 17:11:08 UTC (rev 1733)
+++ trunk/app/views/comments/_new.html.erb	2010-06-25 18:55:24 UTC (rev 1734)
@@ -18,7 +18,7 @@
 
   <% if selected == "new_logi" %>
     <%= show_errors 'logi_version','logi' %>
-
+    
     <%= render :partial => 'logis/edit', :locals => {
         :name => 'logi', :logi => @commenting_logi,
         :logi_version => @commenting_logi_version} %>
@@ -52,7 +52,7 @@
         :id => "submit"} do %>
       <label><%= t 'defaults.submit_label' %></label>
       <%= form.submit t('defaults.submit'), 
-          : "$('logi_form').onsubmit()" %>
+          : "logiEditPrepareLink(logi_tags_edit_list); $('logi_form').onsubmit()" %>
       <%= cancel_button :url => logi_url(@logi) %>
     <% end %>
   <% end -%>
@@ -60,11 +60,8 @@
 
 <% javascript_tag do -%>
   mcorners.run();
-<% end -%>
-
-<% if selected == "new_logi" %>
-  <% javascript_tag do -%>
+  <% if selected == "new_logi" %>
     logi_editor.initialize_tiny_mce_now_in_ff();
-  <% end -%>
-<% end %>
+  <% end %>
+<% end -%>
 </div>

Modified: trunk/app/views/logi_inserts/new.html.erb
===================================================================
--- trunk/app/views/logi_inserts/new.html.erb	2010-06-25 17:11:08 UTC (rev 1733)
+++ trunk/app/views/logi_inserts/new.html.erb	2010-06-25 18:55:24 UTC (rev 1734)
@@ -50,41 +50,38 @@
 
           <div id="insert_linked_logi"
               class="no_for_tags_link no_for_perma_link">
-            <% javascript_tag do -%>
-              logi_tags_edit_list = null;
-            <% end -%>
             <%= render :partial => 'logis/edit', :locals => {
                     :name => 'edit_linked_logi', :logi => @new_logi,
                     :logi_version => @new_logi_version, :defer => true} %>
             <div class="spacer"></div>
-          </div><!-- end only_linked_logis -->
+          </div>
 
           <div id="insert_tags_link"
               class="no_for_linked_logi no_for_perma_link">
             <%= render :partial => 'links/new' %>
-          </div><!-- end only_tags_links -->
+          </div>
 
           <div id="insert_perma_link"
               class="no_for_linked_logi no_for_tags_link">
             <%= render :partial => 'perma_links/new' %>
-          </div><!-- end only_perma_links -->
-        <% end %><!-- end link_panel_with_tabs_js -->
-      </div><!-- end only_links -->
+          </div>
+        <% end %>
+      </div>
 
       <div id="insert_external_link"
           class="no_for_link no_for_annotation">
         <%= render :partial => 'external_links/new' %>
-      </div><!-- end only_external_links -->
+      </div>
 
       <div id="insert_annotation"
           class="no_for_link no_for_external_link">
         <%= render :partial => 'annotations/new' %>
-      </div><!-- end only_annotations -->
+      </div>
 
       <%= hidden_field_tag :positioned, true %>
       <%= hidden_field_tag :and_attach, true %>
-    <% end %><!-- end panel_with_tabs_js -->
-  </div><!-- end main_column -->
+    <% end %>
+  </div>
 
   <div class="side_column">
     <% render :layout => 'application/wizzard_cloud_panel' do %>
@@ -114,19 +111,6 @@
 
   <div class="spacer"></div>
   <div class="main_column">
-    <!--
-    <div id="selected_text">
-      <% render :layout => 'application/panel', :locals => {
-             :id => "annotating"} do %>
-        <div class="min_height"></div>
-        <label class="for_selected"><%= t 'v.logi_inserts.selected_label' %></label>
-        <div id="selected_text_text"></div>
-    -->
-        <%= hidden_field_tag :selected_text_field, :autocomplete => "off" %>
-    <!--
-      <% end %>
-    </div>
-    -->
 
     <div id="common">
       <% render :layout => 'application/panel', :locals => {
@@ -152,18 +136,8 @@
     <% end -%>
   </div>
 
-<!--
-  <div class="side_column">
-    <% render :layout => 'application/wizzard_cloud_panel' do %>
-      <h3><%= t 'v.logi_inserts.right_text' %></h3>
-      <p><%= t 'v.logi_inserts.check_indeed' %></p>
-    <% end %>
-  </div>
-  <div class="spacer"></div>
--->
+<% end %>
 
-<% end %><!-- end form-->
-
 <% javascript_tag do -%>
   <% 
   if @selected == 'link'

Modified: trunk/app/views/logis/_edit.html.erb
===================================================================
--- trunk/app/views/logis/_edit.html.erb	2010-06-25 17:11:08 UTC (rev 1733)
+++ trunk/app/views/logis/_edit.html.erb	2010-06-25 18:55:24 UTC (rev 1734)
@@ -1,9 +1,9 @@
 <% render :layout => 'logis/logi', :locals => {:id => "logi_edit"} do %>
   <%= hidden_field_tag 'logi[link_string]', '' %>
   <% if local_assigns[:with_title] %>
-  <%= text_field_tag 'logi[title]', (@logi_version.nil? ? nil : @logi_version.title), 
-          :class => "logi_title", :id => "logi_edit_title",
-          :tabindex => 97 %>
+    <%= text_field_tag 'logi[title]', (@logi_version.nil? ? nil : @logi_version.title), 
+            :class => "logi_title", :id => "logi_edit_title",
+            :tabindex => 97 %>
   <% end %>
   <div id="EditorDiv" style="visibility: hidden;">
     <%= text_area_tag 'logi[body]', 
@@ -15,18 +15,21 @@
 <div id="logi_length_warning" class="length_warning"></div>
 
 <% if !local_assigns[:with_title] %>
-<div id="advanced_area">
-<% render :layout => 'application/panel', :locals => {:id => "advanced"} do %>
-  <label><%= t 'v.logis.extras_label' %></label>
-  <%= toggle_button_to_remote t('v.logis.edit'), {
-          :update => "advanced_area", :url => ((logi_version.nil? or logi.new_record?) ? 
-              new_logi_logi_extras_url(logi) : 
-              edit_logi_logi_extras_url(logi)),
-          :method => :get},
-      :class => 'unfold_button', :tabindex => 99 %>
+  <% javascript_tag do -%>
+    logi_tags_edit_list = null;
+  <% end -%>  
+  <div id="advanced_area">
+    <% render :layout => 'application/panel', :locals => {:id => "advanced"} do %>
+      <label><%= t 'v.logis.extras_label' %></label>
+      <%= toggle_button_to_remote t('v.logis.edit'), {
+              :update => "advanced_area", :url => ((logi_version.nil? or logi.new_record?) ? 
+                  new_logi_logi_extras_url(logi) : 
+                  edit_logi_logi_extras_url(logi)),
+              :method => :get},
+          :class => 'unfold_button', :tabindex => 99 %>
+    <% end %>
+  </div>
 <% end %>
-</div>
-<% end %>
 
 <% javascript_tag do -%>
   logi_editor = new LogiEditor('logi_edit_body','EditorDiv',

Modified: trunk/app/views/tags/_edit.html.erb
===================================================================
--- trunk/app/views/tags/_edit.html.erb	2010-06-25 17:11:08 UTC (rev 1733)
+++ trunk/app/views/tags/_edit.html.erb	2010-06-25 18:55:24 UTC (rev 1734)
@@ -4,7 +4,4 @@
       :link => link,
       :param_name => 'check_ll_link_string', :without_form => true} %>
   <div class="spacer"></div>
-<% end %><!-- end tags -->
-<!--
-<%= render :partial => 'logis/check', :locals => {:name => name} %>
--->
+<% end %>

Modified: trunk/public/stylesheets/ie.css
===================================================================
--- trunk/public/stylesheets/ie.css	2010-06-25 17:11:08 UTC (rev 1733)
+++ trunk/public/stylesheets/ie.css	2010-06-25 18:55:24 UTC (rev 1734)
@@ -27,7 +27,9 @@
 
 /* login */
 
-.blank #user_session_remember_me {
+#user_session_remember_me,
+#lock_version_no,
+#lock_version_yes {
   border: none
 }
 
@@ -52,3 +54,6 @@
 #insert_form textarea#remark {
   overflow: auto;
 }
+#insert_form #submit .button {
+  font-size: 1.2em;
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.