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

Revision: 1644
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1644&view=rev
Author:   wybow
Date:     2009-11-19 22:15:39 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
Added tab-completion

Modified Paths:
--------------
    trunk/app/views/comments/_new.html.erb
    trunk/app/views/logis/_commenting_logis.html.erb
    trunk/app/views/logis/_edit.html.erb
    trunk/app/views/logis/_edit_with_tags.html.erb
    trunk/app/views/logis/_logi.html.erb
    trunk/app/views/logis/_navigation_bar_browse_header.html.erb
    trunk/app/views/logis/_remarks.html.erb
    trunk/app/views/logis/_tag_list.html.erb
    trunk/app/views/logis/index.js.rjs
    trunk/app/views/user_sessions/_method.html.erb
    trunk/app/views/users/_method.html.erb
    trunk/app/views/users/edit.html.erb
    trunk/config/initializers/action_view.rb
    trunk/public/javascripts/application.js
    trunk/public/javascripts/magick_corners.js
    trunk/public/javascripts/taglist.js
    trunk/public/stylesheets/logilogi.css

Modified: trunk/app/views/comments/_new.html.erb
===================================================================
--- trunk/app/views/comments/_new.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/comments/_new.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -25,7 +25,8 @@
       <label><%= _('Submit') %></label>
       <%= form.submit _('Submit'), : "tinyMCE.triggerSave();" +
           " tinyMCE.execCommand('mceRemoveControl', false, 'logi_edit_body');" +
-          " $('logi_form').onsubmit()" %>
+          " $('logi_form').onsubmit()",
+          :tabindex => 101 %>
       <%= cancel_button :url => logi_url(@logi) %>
     <% end %>
   <% else %>

Modified: trunk/app/views/logis/_commenting_logis.html.erb
===================================================================
--- trunk/app/views/logis/_commenting_logis.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/logis/_commenting_logis.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -7,7 +7,9 @@
   <div class="spacer"></div>
   <%= toggle_button_to_remote 'or add a logi below', {:update => "comment_area",
       :url => new_logi_comments_url(@logi), :method => :get},
-      :class => 'unfold_button', :disabled => local_assigns[:unfold_disabled] %>
+      :class => 'unfold_button', :disabled => local_assigns[:unfold_disabled],
+      :tabindex => 3 %>
   <%= button_to 'create a new logi and link to it', new_logi_logi_inserts_url(@logi,
-      :selected => 'link', :link_selected => 'linked_logi'), :class => 'insert_button' %>
+      :selected => 'link', :link_selected => 'linked_logi'),
+          :class => 'insert_button', :tabindex => 2 %>
 <% end %>

Modified: trunk/app/views/logis/_edit.html.erb
===================================================================
--- trunk/app/views/logis/_edit.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/logis/_edit.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -4,7 +4,8 @@
   <%= 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})" %>
+              " $('logi_edit_title'), #{GlobalConfig.maximum_logi_version_size})",
+          :tabindex => 98 %>
 
   <div id="EditorDiv" style="visibility: hidden;">
     <%= text_area_tag 'logi[body]', 

Modified: trunk/app/views/logis/_edit_with_tags.html.erb
===================================================================
--- trunk/app/views/logis/_edit_with_tags.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/logis/_edit_with_tags.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -15,7 +15,8 @@
 
   <% render :layout => 'application/panel', :locals => {:id => "submit"} do %>
     <label><%= _('Submit') %></label>
-    <%= form.submit _('Submit'), : "logiEditPrepareLink(); $('logi_form').submit()" %>
+    <%= form.submit _('Submit'), : "logiEditPrepareLink(); $('logi_form').submit()",
+        :tabindex => 100 %>
     <%= cancel_button :url => (@logi.new_record? ? nil : logi_url(@logi)) %>
   <% end %>
   <div class="spacer"></div>

Modified: trunk/app/views/logis/_logi.html.erb
===================================================================
--- trunk/app/views/logis/_logi.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/logis/_logi.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -2,7 +2,8 @@
 <div id="<%= id %>" class="box logi logi_body logi_current">
   <%= (local_assigns[:action] == :view ? 
   button_to('Insert into logi',
-          new_logi_logi_inserts_url(@logi), :class => 'insert_button') +
+          new_logi_logi_inserts_url(@logi), :class => 'insert_button', 
+          :tabindex => 1) +
       perma_links(@logi, @logi_version) : '' )%>
   <div class="panel_content_padding">
     <div id="logi_min_height"></div>

Modified: trunk/app/views/logis/_navigation_bar_browse_header.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_browse_header.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/logis/_navigation_bar_browse_header.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -6,5 +6,6 @@
         :link => (current_context.nil? ? nil : current_context.link),
         :url => browse_logis_url(:ll_link_string => ''),
         :param_name => 'll_link_string',
-        :replace_string => 'All', :without_spacer => true} %>
+        :replace_string => 'All', :without_spacer => true,
+        :no_focus => true} %>
 <div class="spacer"></div>

Modified: trunk/app/views/logis/_remarks.html.erb
===================================================================
--- trunk/app/views/logis/_remarks.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/logis/_remarks.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -3,7 +3,8 @@
   <% remote_thorny_form_for([@logi, @remark], :update => 'remarks',
       :html => {:id => "create_remark"}) do |form| %>
     <%= text_area :remark, :message %>
-    <%= form.submit _('add remark'), : "$('create_remark').onsubmit()", :class => 'add_button' %>
+    <%= form.submit _('add remark'), : "$('create_remark').onsubmit()", 
+        :class => 'add_button' %>
   <% end %>
   <div class="spacer"></div>
 <% end %>

Modified: trunk/app/views/logis/_tag_list.html.erb
===================================================================
--- trunk/app/views/logis/_tag_list.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/logis/_tag_list.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -12,15 +12,16 @@
         (link.nil? ? '' : link.to_s(:direction => :requested, :step => -1)),
         :autocomplete => "off" %>
     <%= text_field_tag (name + '_input'), nil, :id => (name + '_input'),
-        :class => 'tag_list', :autocomplete => 'off' %>
+        :class => 'tag_list', :autocomplete => 'off', :tabindex => 93 %>
     <%= content_tag('div', '', :class => 'auto_complete', :id => 'tag_auto_complete') %>
     <%= auto_complete_field (name + '_input'), 
         :url => used_tags_path(:format => :js), :method => :get,
         :param_name => 'search', :update => 'tag_auto_complete',
         :min_chars => 1 %>
     <%= button_to_function 'Add tag', 
-        (name + '.add_tag_from_field(); ' + name + '.submit()'),
-        :class => 'add_button tag_list' %>
+        (name + '.add_tag_from_field(); ' + name + ".submit();" +
+          (local_assigns[:no_focus] ? '' : " $('" + name + "_input').focus();")),
+        :class => 'add_button tag_list', :tabindex => 94 %>
   </div>
 <% if !local_assigns[:without_form] %>
   <%= end_form_tag() %>

Modified: trunk/app/views/logis/index.js.rjs
===================================================================
--- trunk/app/views/logis/index.js.rjs	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/logis/index.js.rjs	2009-11-19 22:15:39 UTC (rev 1644)
@@ -4,4 +4,5 @@
 page.replace 'cloud', @cloud
 page.replace 'tag_sets', @tag_sets
 page.replace 'incoming_links_to_tags', @incoming_links_to_tags
-page.call('mcorners.run')
+page.call("mcorners.run")
+page.call("focusBrowseListInput")

Modified: trunk/app/views/user_sessions/_method.html.erb
===================================================================
--- trunk/app/views/user_sessions/_method.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/user_sessions/_method.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -14,13 +14,13 @@
 
     <% form_for @user_session, :url => user_session_path do |form| %>
       <% if selected == "normal" %>
-        <%= form.text_field :email %>
-        <%= form.password_field :password %>
+        <%= form.text_field :email, :tabindex => 1 %>
+        <%= form.password_field :password, :tabindex => 2 %>
       <% else %>
-        <%= form.text_field :openid_identifier %>
+        <%= form.text_field :openid_identifier, :tabindex => 1 %>
       <% end %>
-      <%= form.check_box :remember_me, :checked => true, :label_class => 'behind' %>
-      <%= form.submit _('Login') %>
+      <%= form.check_box :remember_me, :checked => true, :label_class => 'behind', :tabindex => 3 %>
+      <%= form.submit _('Login'), :tabindex => 4 %>
       <%= cancel_button %>
     <% end -%>
 

Modified: trunk/app/views/users/_method.html.erb
===================================================================
--- trunk/app/views/users/_method.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/users/_method.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -15,15 +15,15 @@
     <% end %>
 
     <% form_for(@user, :html => {:id => "new_form"}) do |form| %>
-      <%= form.text_field 'name', :label => _("Full Name") %>
-      <%= form.text_field 'email' %>
+      <%= form.text_field 'name', :label => _("Full Name"), :tabindex => 1 %>
+      <%= form.text_field 'email', :tabindex => 2 %>
       <% if selected == "normal" %>
-        <%= form.password_field :password %>
-        <%= form.password_field :password_confirmation %>
-        <%= form.submit _('Complete!') %>
+        <%= form.password_field :password, :tabindex => 3 %>
+        <%= form.password_field :password_confirmation, :tabindex => 4 %>
+        <%= form.submit _('Complete!'), :tabindex => 5 %>
       <% else %>
-        <%= form.text_field :openid_identifier %>
-        <%= form.submit _('Continue') %>
+        <%= form.text_field :openid_identifier , :tabindex => 3 %>
+        <%= form.submit _('Continue'), :tabIndex => 4 %>
       <% end %>
       <%= cancel_button %>
     <% end %>

Modified: trunk/app/views/users/edit.html.erb
===================================================================
--- trunk/app/views/users/edit.html.erb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/app/views/users/edit.html.erb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -33,11 +33,11 @@
     <% form_for(@user, :html => {:id => "email_form"}) do |form| %>
       <p><%= "You can " + link_to("set your avatar here", "http://gravatar.com/signup") %></p>
       <p><%= _("Leave blank/unchanged any field you don't want to change") %></p>
-      <%= form.text_field 'email' %>
-      <%= form.password_field :password %>
-      <%= form.password_field :password_confirmation %>
-      <%= form.text_field :openid_identifier %>
-      <%= form.submit _('Save') %>
+      <%= form.text_field 'email', :tabindex => 1 %>
+      <%= form.password_field :password, :tabindex => 2 %>
+      <%= form.password_field :password_confirmation, :tabindex => 3 %>
+      <%= form.text_field :openid_identifier, :tabindex => 4 %>
+      <%= form.submit _('Save'), :tabindex => 5 %>
       <%= cancel_button %>
     <% end %>
   <% end %>

Modified: trunk/config/initializers/action_view.rb
===================================================================
--- trunk/config/initializers/action_view.rb	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/config/initializers/action_view.rb	2009-11-19 22:15:39 UTC (rev 1644)
@@ -62,6 +62,7 @@
         html_options[:class] ||= 'ok_button'
         html_options[:class] = 'button ' + html_options[:class]
         html_options[:onclick] ||= 'location.href = \'' + url + '\'; return false;'
+        html_options[:onkeydown] ||= 'if (event.keyCode == Event.KEY_RETURN) {this.onclick()};'
         html_options = html_options.stringify_keys
         convert_options_to_javascript!(html_options, url)
         tag_options = tag_options(html_options)
@@ -91,6 +92,7 @@
         #{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
 
         html_options = html_options.stringify_keys
+        html_options[:onkeydown] ||= 'if (event.keyCode === Event.KEY_RETURN) {this.onclick()};'
         tag_options = tag_options(html_options)
 
         content_tag(:div, 

Modified: trunk/public/javascripts/application.js
===================================================================
--- trunk/public/javascripts/application.js	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/public/javascripts/application.js	2009-11-19 22:15:39 UTC (rev 1644)
@@ -184,7 +184,7 @@
       width: "446",
       height: "715", // also set in css
       init_instance_callback: logiLogisInitEditor(this.title_id,
-          this.hidden_div_id, this.maximum_logi_size),
+          this.hidden_div_id, this.textarea_id, this.maximum_logi_size),
       editor_selector : "editable"
     });
   }
@@ -234,7 +234,7 @@
   };
 }
 
-function logiLogisInitEditor(title_id, editor_id, max_size) {
+function logiLogisInitEditor(title_id, editor_id, textarea_id, max_size) {
   return function (inst) {
     var title = $(title_id);
     var f = logiLogisEditorOnChange(title, max_size);
@@ -242,6 +242,7 @@
     inst.onEvent.add(f);
     inst.onExecCommand.add(f);
     $(editor_id).style.visibility = "visible";
+    $(textarea_id + '_ifr').setAttribute('tabindex', "99");
     $('length_warning').appendChild(document.createTextNode(""));
   };
 }
@@ -424,3 +425,9 @@
     }
   });
 }
+
+// For browsing
+
+function focusBrowseListInput() {
+  $('browse_list_input').focus();
+}

Modified: trunk/public/javascripts/magick_corners.js
===================================================================
--- trunk/public/javascripts/magick_corners.js	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/public/javascripts/magick_corners.js	2009-11-19 22:15:39 UTC (rev 1644)
@@ -172,6 +172,7 @@
           outer_element.setAttribute('id','');
           outer_element.id = tempId;
         }
+
         var tempClassName = element.className;
         element.setAttribute('class','');
         element.className = '';

Modified: trunk/public/javascripts/taglist.js
===================================================================
--- trunk/public/javascripts/taglist.js	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/public/javascripts/taglist.js	2009-11-19 22:15:39 UTC (rev 1644)
@@ -142,7 +142,8 @@
     new Ajax.Request(this.url, {
         asynchronous: true, evalScripts: true, method: 'get', 
         parameters: this.param_name + '=' + 
-        this.hidden_tags_string()}); return false;
+        this.hidden_tags_string()}); 
+        return false;
   },
 
   // Rendering

Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css	2009-11-19 15:49:21 UTC (rev 1643)
+++ trunk/public/stylesheets/logilogi.css	2009-11-19 22:15:39 UTC (rev 1644)
@@ -367,6 +367,15 @@
   color: #ffffff;
   cursor: pointer;
 }
+*:focus {
+  outline-color: #30367e;
+  outline-style: dotted;
+  outline-width: 1px;
+}
+.panel_tabs *:focus,
+#primarytabs *:focus {
+  outline: none;
+}
 .add_button_disabled {
   cursor: default;
 }
@@ -1162,8 +1171,9 @@
   width: 6em;
 }
 .remark p {
-  padding-top: 0.5em;
+  padding-top: 0.8em;
   font-size: 1.2em;
+  line-height: 1.3em;
   text-align: left;
 }
 /* also see logi for remark color */


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