[Logilogi-svn] SF.net SVN: logilogi:[1742] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1742] trunk
|
From: <wy...@us...> - 2010-06-26 09:53:10
|
Revision: 1742
http://logilogi.svn.sourceforge.net/logilogi/?rev=1742&view=rev
Author: wybow
Date: 2010-06-26 09:53:04 +0000 (Sat, 26 Jun 2010)
Log Message:
-----------
Fixed contenders layout bug and IE history bug
Modified Paths:
--------------
trunk/app/controllers/logis_controller.rb
trunk/app/views/logis/_contending_logis.html.erb
trunk/app/views/logis/edit.html.erb
trunk/app/views/logis/index.html.erb
trunk/app/views/logis/index_new_edit.js.rjs
trunk/app/views/logis/new.html.erb
trunk/public/stylesheets/ie7.css
trunk/public/stylesheets/logilogi.css
Modified: trunk/app/controllers/logis_controller.rb
===================================================================
--- trunk/app/controllers/logis_controller.rb 2010-06-26 09:08:13 UTC (rev 1741)
+++ trunk/app/controllers/logis_controller.rb 2010-06-26 09:53:04 UTC (rev 1742)
@@ -88,7 +88,7 @@
end
render :template => 'logis/index_new_edit.js.rjs', :locals => {
:name => "browse_list",
- :url => ("/do/logis" + (current_context.link? ? "/" + current_context.link.to_s : "")),
+ :url => ('/do/logis' + (current_context.link? ? '/' + current_context.link.to_s : '')),
:with_main => true}
end
end
@@ -130,7 +130,7 @@
if !params[:selected]
render :template => 'logis/index_new_edit.js.rjs', :locals => {
:name => "logi_tags_edit_list",
- :url => (current_context.link? ? "/" + current_context.link.to_s + "/do/new" : "/do/new")}
+ :url => ((current_context.link? ? '/' + current_context.link.to_s : '') + '/do/new')}
end
end
end
@@ -188,7 +188,7 @@
if !params[:selected]
render :template => 'logis/index_new_edit.js.rjs', :locals => {
:name => "logi_tags_edit_list",
- :url => (current_context.link? ? "/" + current_context.link.to_s + "/do/edit" : nil)}
+ :url => (current_context.link.to_s + '/do/edit')}
end
end
end
Modified: trunk/app/views/logis/_contending_logis.html.erb
===================================================================
--- trunk/app/views/logis/_contending_logis.html.erb 2010-06-26 09:08:13 UTC (rev 1741)
+++ trunk/app/views/logis/_contending_logis.html.erb 2010-06-26 09:53:04 UTC (rev 1742)
@@ -26,14 +26,14 @@
<% if params[:action] != "new" and params[:action] != "edit" %>
<div id="contenders_padding">
<div class="notice_cloud"><%= t('v.logis.can_do_better') %></div>
- <div class="spacer"></div>
- <%= new_logi_button t('v.logis.create_new_competing_logi') %>
<div class="description">
<p>
<%= t('v.logis.count_contending', :count => contender_logis.size) %>
</p>
</div>
<div class="spacer"></div>
+ <%= new_logi_button t('v.logis.create_new_competing_logi') %>
+ <div class="spacer"></div>
</div>
<% else %>
<p class="one_line"> </p>
Modified: trunk/app/views/logis/edit.html.erb
===================================================================
--- trunk/app/views/logis/edit.html.erb 2010-06-26 09:08:13 UTC (rev 1741)
+++ trunk/app/views/logis/edit.html.erb 2010-06-26 09:53:04 UTC (rev 1742)
@@ -2,11 +2,9 @@
:html => {:id => "logi_form"}) do |form| %>
<%= render :partial => 'dhtml_history_js.html.erb' %>
<% javascript_tag do -%>
- <% if !current_context.link? %>
- if (dhtmlHistory.isFirstLoad()) {
- <%= add_simple_history_string('logi_tags_edit_list', '', '') %>
- }
- <% end -%>
+ if (dhtmlHistory.isFirstLoad()) {
+ <%= add_simple_history_string('logi_tags_edit_list', '/' + current_context.link.to_s + '/do/edit', '') %>
+ }
<% end %>
<%= render :partial => 'edit_with_tags', :locals => {:form => form} %>
<% end -%>
Modified: trunk/app/views/logis/index.html.erb
===================================================================
--- trunk/app/views/logis/index.html.erb 2010-06-26 09:08:13 UTC (rev 1741)
+++ trunk/app/views/logis/index.html.erb 2010-06-26 09:53:04 UTC (rev 1742)
@@ -3,7 +3,7 @@
<% javascript_tag do -%>
<% if !current_context.link? %>
if (dhtmlHistory.isFirstLoad()) {
- <%= add_simple_history_string('browse_list', '', '') %>
+ <%= add_simple_history_string('browse_list', '/do/logis', '') %>
}
<% end -%>
<% end %>
Modified: trunk/app/views/logis/index_new_edit.js.rjs
===================================================================
--- trunk/app/views/logis/index_new_edit.js.rjs 2010-06-26 09:08:13 UTC (rev 1741)
+++ trunk/app/views/logis/index_new_edit.js.rjs 2010-06-26 09:53:04 UTC (rev 1742)
@@ -10,5 +10,5 @@
if current_context.link?
page.add_simple_history(name, url, current_context.link.to_s)
else
- page.add_simple_history(name, '', '')
+ page.add_simple_history(name, url, '')
end
Modified: trunk/app/views/logis/new.html.erb
===================================================================
--- trunk/app/views/logis/new.html.erb 2010-06-26 09:08:13 UTC (rev 1741)
+++ trunk/app/views/logis/new.html.erb 2010-06-26 09:53:04 UTC (rev 1742)
@@ -2,7 +2,7 @@
<% javascript_tag do -%>
<% if !current_context.link? %>
if (dhtmlHistory.isFirstLoad()) {
- <%= add_simple_history_string('logi_tags_edit_list','','') %>
+ <%= add_simple_history_string('logi_tags_edit_list','/do/new','') %>
}
<% end -%>
<% end %>
Modified: trunk/public/stylesheets/ie7.css
===================================================================
--- trunk/public/stylesheets/ie7.css 2010-06-26 09:08:13 UTC (rev 1741)
+++ trunk/public/stylesheets/ie7.css 2010-06-26 09:53:04 UTC (rev 1742)
@@ -6,7 +6,8 @@
}
#contenders_padding .description {
- margin-top: -2.5em;
+ margin-top: -3.5em;
+ margin-bottom: 1em;
}
/* browsing */
Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css 2010-06-26 09:08:13 UTC (rev 1741)
+++ trunk/public/stylesheets/logilogi.css 2010-06-26 09:53:04 UTC (rev 1742)
@@ -925,6 +925,9 @@
#contenders .border_panel {
margin-left: 1em;
}
+#contenders .button {
+ float: right;
+}
#contenders_padding {
padding: 1em 0 0 1em;
margin-bottom: 1em;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|