Menu
▾
▴
[Crackerjack-devel-changes] SF.net SVN: crackerjack:[894] trunk/viewsite
|
From: <zn...@us...> - 2009-05-29 09:07:34
|
Revision: 894
http://crackerjack.svn.sourceforge.net/crackerjack/?rev=894&view=rev
Author: znz
Date: 2009-05-29 09:07:08 +0000 (Fri, 29 May 2009)
Log Message:
-----------
use tab and do not use ajax to update customized URL
Modified Paths:
--------------
trunk/viewsite/app/controllers/compare_results_controller.rb
trunk/viewsite/app/helpers/compare_results_helper.rb
trunk/viewsite/app/views/compare_results/index.html.erb
trunk/viewsite/app/views/layouts/application.html.erb
trunk/viewsite/public/javascripts/application.js
trunk/viewsite/public/stylesheets/application.css
Modified: trunk/viewsite/app/controllers/compare_results_controller.rb
===================================================================
--- trunk/viewsite/app/controllers/compare_results_controller.rb 2009-05-29 09:06:25 UTC (rev 893)
+++ trunk/viewsite/app/controllers/compare_results_controller.rb 2009-05-29 09:07:08 UTC (rev 894)
@@ -7,19 +7,25 @@
:order => "hostname ASC, kernel_version ASC, testcases_version ASC",
}
opts[:col] = opts[:row].dup
+ @selected_tab = nil
+ @custom_table = false
[:row, :col].each do |key|
case params[key]
when 'all'
+ @selected_tab = :all
@title = "All Kernels"
when /\d/
+ @custom_table = true
ids = params[key].split(/\D+/).map{|s|s.to_i}
opts["#{key}_ids"] = ids
opts[key][:conditions] = ["id in (?)", ids]
opts[key].delete(:order)
when '!d'
+ @selected_tab = :vanilla
@title = "Vanilla Kernels"
opts[key][:conditions] = ["distribution_kernel = ?", false]
else
+ @selected_tab = :distro
@title = "Distribution Kernels"
opts[key][:conditions] = ["distribution_kernel = ?", true]
end
Modified: trunk/viewsite/app/helpers/compare_results_helper.rb
===================================================================
--- trunk/viewsite/app/helpers/compare_results_helper.rb 2009-05-29 09:06:25 UTC (rev 893)
+++ trunk/viewsite/app/helpers/compare_results_helper.rb 2009-05-29 09:07:08 UTC (rev 894)
@@ -1,2 +1,7 @@
module CompareResultsHelper
+ def tab_class(tab)
+ if @selected_tab == tab
+ ' class="ui-tabs-selected"'
+ end
+ end
end
Modified: trunk/viewsite/app/views/compare_results/index.html.erb
===================================================================
--- trunk/viewsite/app/views/compare_results/index.html.erb 2009-05-29 09:06:25 UTC (rev 893)
+++ trunk/viewsite/app/views/compare_results/index.html.erb 2009-05-29 09:07:08 UTC (rev 894)
@@ -1,15 +1,19 @@
<%- @title ||= 'Kernels' -%>
-<ul>
- <li><%= link_to 'Distribution Kernels', cjk_path %></li>
- <li><%= link_to 'Vanilla Kernels', :row => '!d', :col => '!d' %></li>
+<div class="ui-tabs">
+<ul class="ui-tabs-nav">
+ <li<%= tab_class(:distro) %>><%= link_to 'Distribution Kernels', cjk_path %></li>
+ <li<%= tab_class(:vanilla) %>><%= link_to 'Vanilla Kernels', :row => '!d', :col => '!d' %></li>
<%- if false -%>
- <li><%= link_to 'All Kernels', :row => 'all', :col => 'all' %></li>
+ <li<%= tab_class(:all) %>><%= link_to 'All Kernels', :row => 'all', :col => 'all' %></li>
<%- end -%>
+<%- if @custom_table -%>
+ <li class="ui-tabs-selected"><%= link_to 'Customized', :row => params[:row], :col => params[:col] %></li>
+<%- end -%>
<li id="permalink_container" style="display:none"><%= link_to 'Permalink', { :row => nil, :col => nil }, { :id => "permalink" } %></li>
</ul>
-
+<div class="ui-tabs-panel">
<%- all = ExecuteResult.all -%>
<table style="margin: 1em">
<tr>
@@ -63,3 +67,5 @@
</tr>
</table>
+</div>
+</div>
Modified: trunk/viewsite/app/views/layouts/application.html.erb
===================================================================
--- trunk/viewsite/app/views/layouts/application.html.erb 2009-05-29 09:06:25 UTC (rev 893)
+++ trunk/viewsite/app/views/layouts/application.html.erb 2009-05-29 09:07:08 UTC (rev 894)
@@ -10,6 +10,9 @@
<%- if @canonical_url -%>
<link rel="canonical" href="<%=h @canonical_url %>" />
<%- end -%>
+ <%= javascript_include_tag "jquery-1.3.2.min" %>
+ <%#= javascript_include_tag :defaults %>
+ <%= javascript_include_tag "application" %>
</head>
<body>
<h2 class="header">
@@ -22,9 +25,6 @@
<%= link_to "Crackerjack", :controller => "compare_results", :action => "index", :row => '!d', :col => '!d' %>
<%= link_to "[About Page]", :controller => "document", :action => "index_en" %>
- <%= javascript_include_tag "jquery-1.3.2.min" %>
- <%#= javascript_include_tag :defaults %>
- <%= javascript_include_tag "application" %>
</h2>
<h1><%=h @title %></h1>
Modified: trunk/viewsite/public/javascripts/application.js
===================================================================
--- trunk/viewsite/public/javascripts/application.js 2009-05-29 09:06:25 UTC (rev 893)
+++ trunk/viewsite/public/javascripts/application.js 2009-05-29 09:07:08 UTC (rev 894)
@@ -2,11 +2,16 @@
// This file is automatically included by javascript_include_tag :defaults
App = {};
+App.use_ajax = false;
App.updatePermalink = function() {
if (!App.permalink_base) {
App.permalink_base = jQuery("#permalink").attr("href");
}
var href = App.permalink_base + '?col=' + App.getIds(".col_name") + '&row=' + App.getIds(".row_name");
+ if (!App.use_ajax) {
+ location.href = href;
+ return;
+ }
jQuery("#permalink").attr("href", href);
jQuery("#permalink_container").show();
};
@@ -37,6 +42,12 @@
if (row_add.selectedIndex < 0) return;
var option = row_add.options[row_add.selectedIndex];
var row = option.value;
+ if (!App.use_ajax) {
+ // add dummy
+ $("<span style='display:none' class='row_name' id='row_"+row+"'></span>").insertAfter("#compare_results");
+ App.updatePermalink();
+ return;
+ }
var col = App.getIds(".col_name");
jQuery.get(window.location.pathname, { col: col, row: row }, function(text) {
try {
@@ -55,6 +66,12 @@
if (col_add.selectedIndex < 0) return;
var option = col_add.options[col_add.selectedIndex];
var col = option.value;
+ if (!App.use_ajax) {
+ // add dummy
+ $("<span style='display:none' class='col_name' id='"+col+"'></span>").insertAfter("#compare_results");
+ App.updatePermalink();
+ return;
+ }
var row = App.getIds(".row_name");
jQuery.get(window.location.pathname, { col: col, row: row }, function(text) {
try {
Modified: trunk/viewsite/public/stylesheets/application.css
===================================================================
--- trunk/viewsite/public/stylesheets/application.css 2009-05-29 09:06:25 UTC (rev 893)
+++ trunk/viewsite/public/stylesheets/application.css 2009-05-29 09:07:08 UTC (rev 894)
@@ -20,6 +20,7 @@
text-decoration: none;
}
+/* scaffold */
body { background-color: #fff; color: #333; }
.fieldWithErrors {
@@ -57,3 +58,15 @@
font-size: 12px;
list-style: square;
}
+
+/* Tabs
+----------------------------------*/
+.ui-tabs { padding: .2em; zoom: 1; }
+.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
+.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; background-color: #ccc }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
