[Logilogi-svn] SF.net SVN: logilogi:[1730] trunk

Revision: 1730
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1730&view=rev
Author:   wybow
Date:     2010-06-24 16:42:43 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
Updated dbr header

Modified Paths:
--------------
    trunk/app/models/const/tag.rb
    trunk/app/views/layouts/_dbr_header.html.erb
    trunk/app/views/layouts/_de_header.html.erb
    trunk/app/views/layouts/_header.html.erb
    trunk/app/views/layouts/user_page.html.erb
    trunk/config/routes.rb
    trunk/public/stylesheets/dbr.css

Modified: trunk/app/models/const/tag.rb
===================================================================
--- trunk/app/models/const/tag.rb	2010-06-24 16:07:59 UTC (rev 1729)
+++ trunk/app/models/const/tag.rb	2010-06-24 16:42:43 UTC (rev 1730)
@@ -10,6 +10,6 @@
     CHECK_TAGS_RE = /^#{BLOCK_SLOPPY_TAG}(?:\/#{BLOCK_SLOPPY_TAG})*\/?$/
     CHECK_TAG_RE = /^#{BLOCK_TAG}$/
 
-    RESERVED_WORDS_RE = /^(Do|Pub)$/
+    RESERVED_WORDS_RE = /^(Do|Pub|Users)$/
   end
 end

Modified: trunk/app/views/layouts/_dbr_header.html.erb
===================================================================
--- trunk/app/views/layouts/_dbr_header.html.erb	2010-06-24 16:07:59 UTC (rev 1729)
+++ trunk/app/views/layouts/_dbr_header.html.erb	2010-06-24 16:42:43 UTC (rev 1730)
@@ -10,17 +10,27 @@
                       <table width="680" border="0" cellspacing="0" cellpadding="0" height="130">
                         <tr height="25">
                           <td height="25">
+  <% if !local_assigns[:user_page] %>
+    <div id="top_search">
+      <% form_for(:search, nil, :url => browse_logis_url(:ll_link_string => ''),
+          :html => {:method => :get}) do |form| %>
+        <%= form.text_field :ll_link_string, :name => :top_ll_link_string, :value => @query,
+                :no_label => true, :id => 'top_search_query' %>
+        <%= form.submit t('v.searches.search'), :id => 'top_search_button',
+            :class => 'go_button' %>
+      <% end %>
+    </div>
+  <% end %>
   <div id="sessions">
     <% if current_user.anonymous? %>
      <%= link_to t('v.layouts.signup'), new_user_url %> |
-     <%= link_to t('v.layouts.login'), new_user_session_url %>
+     <%= link_to t('v.layouts.login'), new_user_session_url %><%= (local_assigns[:user_page] ? '' : ' |') %>
     <% else %>
-      <%= t 'v.layouts.welcome', :name => truncate(current_user.name, :length => 15) %> |
       <%= link_to t('v.layouts.user_page'), user_url(current_user) %> |
       <%= link_to t('v.layouts.preferences'), edit_user_url(current_user) %> |
-      <%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %>
+      <%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %><%= (local_assigns[:user_page] ? '' : ' |') %>
     <% end %>
-  </div>                          
+  </div>
                           </td>
                         </tr>
                         <tr height="105">

Modified: trunk/app/views/layouts/_de_header.html.erb
===================================================================
--- trunk/app/views/layouts/_de_header.html.erb	2010-06-24 16:07:59 UTC (rev 1729)
+++ trunk/app/views/layouts/_de_header.html.erb	2010-06-24 16:42:43 UTC (rev 1730)
@@ -1,8 +1,11 @@
 <% if GlobalConfig.site_subdomain != "dbr" %>
-  <div id="network_bar">
-    <div class="panel_content_padding">
+<div id="network_bar">
+  <div class="panel_content_padding">
+    <% if local_assigns[:user_page] %>
+      <%= site_link(:text => t('v.layouts.back_to', :site => GlobalConfig.site_host)) %>
+    <% else %>
       <%= t 'v.layouts.logi_logi_network_label' %>
-      <a href="http://foundation.logilogi.org"><%= t 'v.layouts.logi_logi_foundation' %></a> 
+      <a href="http://foundation.logilogi.org"><%= t 'v.layouts.logi_logi_foundation' %></a>
           - <b><%= GlobalConfig.domain %></b>
       <% GlobalConfig.available_subdomains.each do |subdomain| %>
         <% if subdomain == GlobalConfig.site_subdomain %>
@@ -16,22 +19,33 @@
           :development_open => '<a href="http://sourceforge.net/projects/logilogi/">',
           :list_open => '<a href="https://lists.sourceforge.net/lists/listinfo/logilogi-list">',
           :link_close => '</a>' %>
-    </div>
+    <% end %>
   </div>
+</div>
 <% end %>
 <div id="header_bar">
-  <%= render :partial => 'layouts/dbr_header' %>
+  <%= render :partial => 'layouts/dbr_header', :locals => {
+      :user_page => local_assigns[:user_page]} %>
 </div>
 <div id="header">
-  <!-- Sessions in dbr_header -->
-  <div id="primarytabs">
-    <ul>
-      <li id="primarytabs_main"><%= link_to t('v.layouts.main'), root_url %></li>
-      <li id="primarytabs_logis"><%= link_to t('v.layouts.topics_and_logis'), browse_logis_url(:ll_link_string => nil) %></li>
-      <li id="primarytabs_changes"><%= link_to t('v.layouts.changes'), changes_url %></li>
-<!--      <li id="primarytabs_groups"><%= link_to t('v.layouts.groups'), peer_groups_url %></li> -->
-      <li id="primarytabs_users"><%= link_to t('v.layouts.users'), users_url %></li>
-    </ul>
+  <% if local_assigns[:user_page] %>
+  <div style="float:left">
+      <img src="/images/user_header_background.png" width="6" height="80"/>
   </div>
+  <div id="header_content">
+      <%= gravatar_for(@user, :size => 80, :class => 'avatar') %>
+    <div id="header_text">
+      <div id="site_link">
+          <%= link_to(@user.blog_title, @user, :class => 'sitename') %>
+      </div>
+      <div id="title_line">
+          <%= by_author(@user) %>
+      </div>
+    </div>
+  </div>
+  <% end %>
+  <% if !local_assigns[:tabs_disabled] %>
+    <%= render :partial => 'layouts/tabs' %>
+  <% end %>
   <div class="spacer"></div>
 </div>

Modified: trunk/app/views/layouts/_header.html.erb
===================================================================
--- trunk/app/views/layouts/_header.html.erb	2010-06-24 16:07:59 UTC (rev 1729)
+++ trunk/app/views/layouts/_header.html.erb	2010-06-24 16:42:43 UTC (rev 1730)
@@ -63,20 +63,18 @@
       <% end %>
     </div>
   <% end %>
-    <div id="sessions">
-      <% if current_user.anonymous? %>
-       <%= link_to t('v.layouts.signup'), new_user_url %> |
-       <%= link_to t('v.layouts.login'), new_user_session_url %><%= (local_assigns[:user_page] ? '' : ' |') %>
-      <% else %>
-        <%= link_to t('v.layouts.user_page'), user_url(current_user) %> |
-        <%= link_to t('v.layouts.preferences'), edit_user_url(current_user) %> |
-        <%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %><%= (local_assigns[:user_page] ? '' : ' |') %>
-      <% end %>
-    </div>
-  <% if !local_assigns[:user_page] %>
-    <% if !local_assigns[:tabs_disabled] %>
-      <%= render :partial => 'layouts/tabs' %>
+  <div id="sessions">
+    <% if current_user.anonymous? %>
+     <%= link_to t('v.layouts.signup'), new_user_url %> |
+     <%= link_to t('v.layouts.login'), new_user_session_url %><%= (local_assigns[:user_page] ? '' : ' |') %>
+    <% else %>
+      <%= link_to t('v.layouts.user_page'), user_url(current_user) %> |
+      <%= link_to t('v.layouts.preferences'), edit_user_url(current_user) %> |
+      <%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %><%= (local_assigns[:user_page] ? '' : ' |') %>
     <% end %>
+  </div>
+  <% if !local_assigns[:tabs_disabled] %>
+    <%= render :partial => 'layouts/tabs' %>
   <% end %>
   <div class="spacer"></div>
 </div>

Modified: trunk/app/views/layouts/user_page.html.erb
===================================================================
--- trunk/app/views/layouts/user_page.html.erb	2010-06-24 16:07:59 UTC (rev 1729)
+++ trunk/app/views/layouts/user_page.html.erb	2010-06-24 16:42:43 UTC (rev 1730)
@@ -1,7 +1,8 @@
 <% @page_class += ' main' %>
 <%= render :partial => 'layouts/head' %>
 
-  <%= render :partial => GlobalConfig.header_partial, :locals => {:user_page => true} %>
+  <%= render :partial => GlobalConfig.header_partial, :locals => {
+      :user_page => true, :tabs_disabled => true} %>
 
   <%= yield :top_body %>
 

Modified: trunk/config/routes.rb
===================================================================
--- trunk/config/routes.rb	2010-06-24 16:07:59 UTC (rev 1729)
+++ trunk/config/routes.rb	2010-06-24 16:42:43 UTC (rev 1730)
@@ -45,7 +45,8 @@
       :path_prefix => ':ll_link_string/do',
       :name_prefix => '_hidden_',
       :requirements => { :ll_link_string => /.*/ }
-  map.resources :users, :peer_group_admin_memberships, :peer_group_memberships,
+  map.resources :users
+  map.resources :peer_group_admin_memberships, :peer_group_memberships,
           :user_groups, :prefs_profiles, :invitations, :votes, :remarks, 
           :annotations, :links, :linked_logis, :comments, :ratings, :paths, 
           :steps,

Modified: trunk/public/stylesheets/dbr.css
===================================================================
--- trunk/public/stylesheets/dbr.css	2010-06-24 16:07:59 UTC (rev 1729)
+++ trunk/public/stylesheets/dbr.css	2010-06-24 16:42:43 UTC (rev 1730)
@@ -1,13 +1,20 @@
 #header {
   height: 36px;
 }
-#sessions {
+#top_search {
   margin-right: 0em;
   padding-right: 0em;
+  margin-bottom: 0.5em;
+}
+#sessions {
   padding-left: 3em;
   padding-top: 0.4em;
   color: black;
 }
+#users_show #sessions {
+  margin-right: 0em;
+  padding-right: 0em;
+}
 #sessions a {
   color: #30367e;
 #}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.