[Logilogi-svn] SF.net SVN: logilogi:[1718] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1718] trunk
|
From: <wy...@us...> - 2010-04-09 16:20:46
|
Revision: 1718
http://logilogi.svn.sourceforge.net/logilogi/?rev=1718&view=rev
Author: wybow
Date: 2010-04-09 16:20:39 +0000 (Fri, 09 Apr 2010)
Log Message:
-----------
More UI-fixes, nearly stable again
Modified Paths:
--------------
trunk/app/controllers/annotations_controller.rb
trunk/app/controllers/comments_controller.rb
trunk/app/controllers/external_links_controller.rb
trunk/app/controllers/linked_logis_controller.rb
trunk/app/controllers/links_controller.rb
trunk/app/controllers/logi_inserts_controller.rb
trunk/app/views/logi_inserts/new.html.erb
trunk/app/views/logis/_edit.html.erb
trunk/public/stylesheets/logilogi.css
Modified: trunk/app/controllers/annotations_controller.rb
===================================================================
--- trunk/app/controllers/annotations_controller.rb 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/app/controllers/annotations_controller.rb 2010-04-09 16:20:39 UTC (rev 1718)
@@ -21,9 +21,6 @@
### Bodies
- top_body :navigation_bar_insert,
- : [:create, :edit, :destroy]
-
def create
new_annotation_position_range_list = self.weave_out_annotations(
params[:body_with_inserts], @logi_version, @logi)
Modified: trunk/app/controllers/comments_controller.rb
===================================================================
--- trunk/app/controllers/comments_controller.rb 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/app/controllers/comments_controller.rb 2010-04-09 16:20:39 UTC (rev 1718)
@@ -19,10 +19,6 @@
before_filter :resolve_context, :find_logi_and_logi_version,
:except => :index
- ### Bodies
-
- top_body :navigation_bar_edit
-
### REST-methods
def new
Modified: trunk/app/controllers/external_links_controller.rb
===================================================================
--- trunk/app/controllers/external_links_controller.rb 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/app/controllers/external_links_controller.rb 2010-04-09 16:20:39 UTC (rev 1718)
@@ -19,11 +19,6 @@
before_filter :resolve_context, :page_name,
:find_logi_and_logi_version
- ### Bodies
-
- top_body :navigation_bar_insert,
- : [:create, :edit, :destroy]
-
### REST-methods
def create
@@ -53,16 +48,14 @@
redirect_to logi_url(@logi)
else
@external_link = ExternalLink.new
- @selected = 'link'
- @link_selected = 'external_link'
+ @selected = 'external_link'
render :template => 'logi_inserts/new'
end
else
@external_link = ExternalLink.new(:url => params[:external_link][:url],
:text => params[:external_link][:text])
flash[:error] = t 'c.external_links.error_adding'
- @selected = 'link'
- @link_selected = 'external_link'
+ @selected = 'external_link'
render :template => 'logi_inserts/new'
end
end
Modified: trunk/app/controllers/linked_logis_controller.rb
===================================================================
--- trunk/app/controllers/linked_logis_controller.rb 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/app/controllers/linked_logis_controller.rb 2010-04-09 16:20:39 UTC (rev 1718)
@@ -19,19 +19,15 @@
before_filter :resolve_context, :page_name,
:find_logi_and_logi_version, :except => :index
- ### Bodies
-
- top_body :navigation_bar_edit
-
### REST-methods
def new
- @selected = params[:selected] || 'new_logi'
+ @selected = params[:selected] || 'link'
+ @link_selected = 'linked_logi'
@new_logi = Logi.new_with(:creator => current_user,
:user_group => current_prefs.user_group)
@new_logi_version = @new_logi.current_logi_version
- render :partial => 'new.html.erb', :locals => {
- :selected => @selected}
+ render :template => 'logi_inserts/new'
end
# needed to switch tags after error
alias :show :new
Modified: trunk/app/controllers/links_controller.rb
===================================================================
--- trunk/app/controllers/links_controller.rb 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/app/controllers/links_controller.rb 2010-04-09 16:20:39 UTC (rev 1718)
@@ -19,11 +19,6 @@
before_filter :resolve_context, :page_name,
:find_logi_and_logi_version, :except => :index
- ### Bodies
-
- top_body :navigation_bar_insert,
- : [:create, :edit, :destroy]
-
### REST-methods
def create
Modified: trunk/app/controllers/logi_inserts_controller.rb
===================================================================
--- trunk/app/controllers/logi_inserts_controller.rb 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/app/controllers/logi_inserts_controller.rb 2010-04-09 16:20:39 UTC (rev 1718)
@@ -20,13 +20,16 @@
before_filter :resolve_context, :page_name, :find_logi_and_logi_version
- ### Bodies
-
### REST-methods
def new
@selected = params[:selected]
@link_selected = params[:link_selected]
+
+ @new_logi = Logi.new_with(:creator => current_user,
+ :user_group => current_prefs.user_group)
+ @new_logi_version = @new_logi.current_logi_version
+
render :layout => 'blank'
end
end
Modified: trunk/app/views/logi_inserts/new.html.erb
===================================================================
--- trunk/app/views/logi_inserts/new.html.erb 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/app/views/logi_inserts/new.html.erb 2010-04-09 16:20:39 UTC (rev 1718)
@@ -51,7 +51,8 @@
<div id="insert_linked_logi"
class="no_for_tags_link no_for_perma_link">
<%= render :partial => 'logis/edit', :locals => {
- :name => 'edit_linked_logi', :logi_version => nil, :defer => true} %>
+ :name => 'edit_linked_logi', :logi => @new_logi,
+ :logi_version => @new_logi_version, :defer => true} %>
<div class="spacer"></div>
</div><!-- end only_linked_logis -->
@@ -176,6 +177,8 @@
mcorners.defer('<%= select_option + "', '#insert_" + select_option %>',
'div.cancel_button');
mcorners.defer('<%= select_option + "', '#insert_" + select_option %>',
+ 'div.unfold_button');
+ mcorners.defer('<%= select_option + "', '#insert_" + select_option %>',
'div.logi_body');
<% end %>
<% end %>
Modified: trunk/app/views/logis/_edit.html.erb
===================================================================
--- trunk/app/views/logis/_edit.html.erb 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/app/views/logis/_edit.html.erb 2010-04-09 16:20:39 UTC (rev 1718)
@@ -13,12 +13,11 @@
<% 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.new_record? ?
- new_logi_logi_extras_url(@logi) :
- edit_logi_logi_extras_url(@logi)),
+ :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', :disabled => local_assigns[:unfold_disabled],
- :tabindex => 98 %>
+ :class => 'unfold_button', :tabindex => 98 %>
<% end %>
</div>
Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css 2010-04-08 20:49:07 UTC (rev 1717)
+++ trunk/public/stylesheets/logilogi.css 2010-04-09 16:20:39 UTC (rev 1718)
@@ -1088,7 +1088,8 @@
.blank .add_button {
margin-left: 0.5em;
}
-#advanced_area .tag {
+#advanced_area .tag,
+.blank .tag {
font-size: 1.2em;
margin-right: 0.3em;
margin-top: 0.8em;
@@ -1112,11 +1113,13 @@
margin-right: 0.5em;
line-height: 1.65em;
}
-#advanced_area input.tag_list {
+#advanced_area input.tag_list,
+.blank input.tag_list {
margin-top: 1em;
font-size: 1em;
}
-#advanced_area .add_tag_form {
+#advanced_area .add_tag_form,
+.blank .add_tag_form {
float: right;
clear: both;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|