Diff
Modified: branches/rails2/app/models/pack.rb (2817 => 2818)
--- branches/rails2/app/models/pack.rb 2011-11-17 00:10:45 UTC (rev 2817)
+++ branches/rails2/app/models/pack.rb 2011-11-17 00:16:52 UTC (rev 2818)
@@ -940,7 +940,6 @@
# penalty for no description
boost -= 20 if description.nil? || description.empty?
- puts "id = #{id}, score = #{boost}"
boost
end
Modified: branches/rails2/app/views/layouts/_myexperiment.rhtml (2817 => 2818)
--- branches/rails2/app/views/layouts/_myexperiment.rhtml 2011-11-17 00:10:45 UTC (rev 2817)
+++ branches/rails2/app/views/layouts/_myexperiment.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
@@ -35,18 +35,20 @@
<% else %>
<%= link_to image_tag(Conf.site_logo), "/" %>
<% end %>
- <div id="site_info_links" class="links">
+ </div>
+ <div id="myexp_links">
+ <div style="text-align: left; float: left; width: 34%; padding-top: 6px;" id="site_info_links" class="links">
<% if @content_for_site_info_links %>
<%= yield :site_info_links %>
<% else %>
<%= render :partial => 'layouts/site_info_links' %>
<% end %>
</div>
+ <div style="text-align: right; float: right; width: 64%;" id="user_links" class="links">
+ <%= render :partial => 'layouts/user_links' %>
+ </div>
</div>
- <div id="user_links" class="links">
- <%= render :partial => 'layouts/user_links' %>
- </div>
- <br class="clearer"/>
+ <div class="clearer"> </div>
</div>
<div id="myexp_tabs">
<%= render :partial => 'layouts/tab_bar' %>
Modified: branches/rails2/app/views/layouts/_tab_bar.rhtml (2817 => 2818)
--- branches/rails2/app/views/layouts/_tab_bar.rhtml 2011-11-17 00:10:45 UTC (rev 2817)
+++ branches/rails2/app/views/layouts/_tab_bar.rhtml 2011-11-17 00:16:52 UTC (rev 2818)
@@ -1,5 +1,7 @@
-<div class="tabnav">
+<ul class="tabnav">
<% Conf.main_tabs.each do |tab| %>
- <%= link_to(tab['label'], tab['link'], :class => "tab", :id => (tab['controller'] && controller.controller_name.match(tab['controller'])) ? 'selected_tabnav' : '') -%>
+ <li <%= (tab['controller'] && controller.controller_name.match(tab['controller'])) ? 'id="selected_tabnav"' : '' %>>
+ <%= link_to(tab['label'], tab['link']) -%>
+ </li>
<% end %>
-</div>
+</ul>
Modified: branches/rails2/config/environment.rb (2817 => 2818)
--- branches/rails2/config/environment.rb 2011-11-17 00:10:45 UTC (rev 2817)
+++ branches/rails2/config/environment.rb 2011-11-17 00:16:52 UTC (rev 2818)
@@ -112,13 +112,15 @@
load 'config/environment_private.rb' if FileTest.exist?('config/environment_private.rb')
# Fix for Ruby 1.8.7 when using Rails < 2.2
-module ActionView
- module Helpers
- module TextHelper
- def truncate(text, length = 30, truncate_string = "...")
- if text.nil? then return end
- l = length - truncate_string.chars.to_a.size
- (text.chars.to_a.size > length ? text.chars.to_a[0...l].join + truncate_string : text).to_s
+if RUBY_VERSION == "1.8.7" && ((RAILS::VERSION::MAJOR == 1) || (RAILS::VERSION::MAJOR == 2 && RAILS::VERSION::MINOR < 2))
+ module ActionView
+ module Helpers
+ module TextHelper
+ def truncate(text, length = 30, truncate_string = "...")
+ if text.nil? then return end
+ l = length - truncate_string.chars.to_a.size
+ (text.chars.to_a.size > length ? text.chars.to_a[0...l].join + truncate_string : text).to_s
+ end
end
end
end
Modified: branches/rails2/public/stylesheets/elico.css (2817 => 2818)
--- branches/rails2/public/stylesheets/elico.css 2011-11-17 00:10:45 UTC (rev 2817)
+++ branches/rails2/public/stylesheets/elico.css 2011-11-17 00:16:52 UTC (rev 2818)
@@ -4,10 +4,14 @@
background: #cfd5dd;
}
-#myexp_searchbar, #myexp_sidebar, a.tab:hover, #selected_tabnav, .pagination a {
+#myexp_searchbar, #myexp_sidebar, .pagination a {
background: #4d597e;
}
+.tabnav li a:hover, .tabnav li#selected_tabnav a {
+ background: none repeat scroll 0 0 #4d597e;
+}
+
#elico_header
{
background: url("/images/elico_back1.png") repeat-x scroll center top #2C3966;
@@ -47,6 +51,10 @@
color: white;
}
+#doc2 {
+ padding: 0 1em;
+}
+
/* IE7 fixes */
#doc2 {
*overflow: hidden;
@@ -55,5 +63,16 @@
#elico_links_bar #inner {
*height: 100%;
+ height: 100%;
}
/* end of IE7 fixes */
+
+#myexp_header {
+ margin: 0em 0.5em;
+}
+
+#hd
+{
+ padding-top: 1em;
+}
+
Modified: branches/rails2/public/stylesheets/styles.css (2817 => 2818)
--- branches/rails2/public/stylesheets/styles.css 2011-11-17 00:10:45 UTC (rev 2817)
+++ branches/rails2/public/stylesheets/styles.css 2011-11-17 00:16:52 UTC (rev 2818)
@@ -7,7 +7,7 @@
http://developer.yahoo.com/yui/fonts/#fontsize
*/
body {
- background: #8e8e8e;
+ background: #8e8e8e url('/images/body-bg.gif') repeat-y center;
/* Only need to define one font here because the
YUI Fonts CSS provides a degradation path
(see: http://developer.yahoo.com/yui/fonts/) */
@@ -127,18 +127,12 @@
#doc2 {
background-color: #FFFFFF;
- padding: 0 1em;
}
#myexp_header {
- margin: 0em 0.5em;
+ margin: 1em 0.5em 0 0.5em;
}
-#hd
-{
- padding-top: 1em;
-}
-
.logo {
float: left;
width: 300px;
@@ -149,9 +143,16 @@
font-weight: bold;
}
+#myexp_links
+{
+ float: right;
+ width: 600px;
+ font-size: 93%;
+}
+
#site_info_links {
- margin: 0.5em 0;
}
+/* margin: 0.5em 0; */
#user_links {
float: right;
@@ -296,8 +297,6 @@
}
/* begin css tabs nav */
-
-/* TODO: Remove me?
.tabnav {
text-align: center;
font-weight: bolder;
@@ -344,34 +343,9 @@
background-color: #317eff;
background-image: none;
color: #FFFFFF;
-} */
-
-.tabnav
-{
- text-align: center;
- margin: 0;
- padding: 0;
}
-a.tab {
- display: inline-block;
- padding: 4px 12px;
- margin-left: 3px;
- border-style: solid;
- border-color: #BBBBBB;
- border-width: 1px 1px 0px 1px;
- text-decoration: none;
- background: url('/images/tab-bg.png') top repeat-x #EDEDED;
- color: #333333;
- font-weight: bolder;
- font-size: 108%;
-}
-a.tab:hover, #selected_tabnav {
- color: #FFFFFF;
- background: #317eff;
-}
-
/* end css tabs nav */
/* begin css breadcrumbs */
@@ -2337,4 +2311,4 @@
font-weight: bold;
margin-bottom: 1.5em;
line-height: 1.4;
-}
\ No newline at end of file
+}
Modified: branches/rails2/test/fixtures/networks.yml (2817 => 2818)
--- branches/rails2/test/fixtures/networks.yml 2011-11-17 00:10:45 UTC (rev 2817)
+++ branches/rails2/test/fixtures/networks.yml 2011-11-17 00:16:52 UTC (rev 2818)
@@ -24,6 +24,8 @@
updated_at: 2007-12-05 15:45:59
exclusive_network:
+ id: 4
+ user_id: 1
title: An Invite Only Network
unique_name: invite_only
created_at: 2007-12-05 15:45:59