@@ -10,3 +10,5 @@ require 'rake/rdoctask' require 'tasks/rails' task :cruise => ['doc:app', 'test'] +# Helper task for the pre-checkin smoke check +task :smoke => ['test', 'talia_core:test', 'widgeon:test'] Rakefile @@ -6,12 +6,12 @@ <!-- link back --> <% for supertype in w.supertypes %> - <!-- <h3 class="super"><%= type_link("<< #{@widget.class_label(supertype)}", supertype) %></h3> --> + <!-- <h3 class="super"><%= type_link("<< #{w.class_label(supertype)}", supertype) %></h3> --> <% end %> <!-- pagina in cui sono --> <% if(w.source_class) %> - <!-- <h3 class="exact"> <%= @widget.class_label(@widget.source_class) %></h3> --> + <!-- <h3 class="exact"> <%= w.class_label(w.source_class) %></h3> --> <% end %> <!-- livelli sotto --> @@ -26,7 +26,7 @@ <div id="pod-list-wrap-ext"> <div id="pod-list-wrap"> - <%= navigation_list %> + <%= w.navigation_list %> </div> </div> </div> app/views/widgets/navigation_bar/_navigation_bar_widget.html.erb @@ -2,6 +2,6 @@ # Down link to navigate to a lower level %> -<li class="ipod_navigation_down_link" id="<%= id_for(type) %>"> - <%= type_link_down(type, level) %> +<li class="ipod_navigation_down_link" id="<%= w.id_for(type) %>"> + <%= w.type_link_down(type, level) %> </li> \ No newline at end of file app/views/widgets/navigation_bar/_navigation_down_link.html.erb @@ -5,11 +5,11 @@ %> <ul id="ipod_nav_level_<%= current_level %>"> - <%= navigation_up_links %> + <%= w.navigation_up_links %> <li class="ipod_navigation_where_i_am" id="current_nav_item"> - <b><%= navigation_title %></b> + <b><%= w.navigation_title %></b> </li> - <%= navigation_down_links(current_level) %> + <%= w.navigation_down_links(current_level) %> </ul> app/views/widgets/navigation_bar/_navigation_list.html.erb @@ -2,6 +2,6 @@ # "Up" link (to navigate back to a previous level %> -<li class="ipod_navigation_back_link" id="<%= id_for(type) %>"> - <%= type_link_up(type) %> +<li class="ipod_navigation_back_link" id="<%= w.id_for(type) %>"> + <%= w.type_link_up(type) %> </li> app/views/widgets/navigation_bar/_navigation_up_link.html.erb @@ -7,7 +7,7 @@ class NavigationBarWidget < Widgeon::Widget assit_kind_of(Array, @allowed_namespaces, "Must configure the allowed namespaces.") @show_home = false # normally don't show the home/back link - + # We'll get the @navigation_type when the navigation is in callback if(@navigation_type && @navigation_type != 'root') @source_class = N::SourceClass.make_uri(@navigation_type, "#") @@ -39,6 +39,91 @@ class NavigationBarWidget < Widgeon::Widget end end + # Creates the "up" links in the navigation list + def navigation_up_links + result = "" + if(show_home) + result << widget_partial("navigation_up_link", :locals => { :type => "Back" }) + end + for supertype in supertypes + result << widget_partial("navigation_up_link", :locals => { :type => supertype }) + end + result + end + + # Creates the "down links in the navigation list + def navigation_down_links(level) + result = "" + for subtype in subtypes + result << widget_partial("navigation_down_link", :locals => { :type => subtype, :level => level }) + end + result + end + + # Creates a link to the given source, moving the ipod list "down" + def type_link_down(type, level) + text = class_label(type) + widget_remote_link(text, + { :javascript => :ipod_down, + :navigation_type => type.to_name_s("#"), + :navigation_id => type_id(type), + :level => level, + :fallback => static_url_for(type) + }, + { :class => "ipodStyle" } ) + end + + # Creates a link to the given type, used as an "up" backlink for the ipod navigation + def type_link_up(type) + text = type.is_a?(String) ? type : class_label(type) + widget_remote_link(text, + { + :javascript => :ipod_up, + :navigation_type => type.is_a?(String) ? "root" : type.to_name_s('#'), + :fallback => static_url_for(type) + }, + { :class => "ipodStyle" } ) + end + + # Title element for the navigation + def navigation_title + source_class ? class_label(source_class) : "Source Types" + end + + # Creates an css id for the given type + def id_for(type) + type.is_a?(String) ? type.downcase : type_id(type) + end + + # Create a paginator for the current type + def type_paginator + @pager = SourcePaginator.new(TaliaCore::TypeRecord.count(:conditions => ["uri = ?", @type.to_s] ), 5, :type => @type) + end + + # Renders the navigation list of level 1 + def navigation_list + widget_partial("navigation_list", + :locals => { :current_level => "1" }) + end + + private + + + # Creates a static url for the given type + def static_url_for(type) + return request.params if(type.is_a?(String)) + static_url_params = request.parameters + if(type) + static_url_params[:id] = type_id(type) + end + url_for(static_url_params) + end + + # Get a type id/string + def type_id(type) + type.to_name_s('_') + end + # This is the callback that updates the scrolling navigation, going down to # the next level remote_call :ipod_down do |page| app/views/widgets/navigation_bar/navigation_bar_widget.rb app/views/widgets/navigation_bar/navigation_bar_helper.rb 07e3b5c923677a8fc1e4492356dd038c40971444 daniel ghub@limitedcreativity.org http://github.com/net7/talia/commit/ea05e095e41289ea4a9eca292049dfa0b076031f ea05e095e41289ea4a9eca292049dfa0b076031f 2008-04-10T09:09:20-07:00 2008-04-10T09:09:20-07:00 New "Helper" mechanism for widgets. git-svn-id: http://svn.talia.discovery-project.eu/talia/trunk/talia_app@567 2960d7dc-a92c-0410-a2fe-c68badc242c0 cf22abc6468b4c28f7a7488bd0de8fa546ce61d0 daniel ghub@limitedcreativity.org