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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1710
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1710&view=rev
Author:   wybow
Date:     2010-03-09 22:45:00 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
Temporarily disabled peergroups

Modified Paths:
--------------
    trunk/app/views/layouts/_de_header.html.erb
    trunk/app/views/layouts/_header.html.erb
    trunk/app/views/logis/_navigation_bar_peer_group_select.html.erb
    trunk/app/views/main_page/_cloud.html.erb
    trunk/app/views/main_page/_new_users_or_groups.html.erb
    trunk/app/views/users/edit.html.erb
    trunk/config/locales/en.yml
    trunk/db/schema.rb
    trunk/public/stylesheets/logilogi.css

Added Paths:
-----------
    trunk/db/migrate/20100309223143_temporarily_disable_groups.rb

Modified: trunk/app/views/layouts/_de_header.html.erb
===================================================================

--- trunk/app/views/layouts/_de_header.html.erb	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/app/views/layouts/_de_header.html.erb	2010-03-09 22:45:00 UTC (rev 1710)
@@ -29,7 +29,7 @@
       <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_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>
   </div>

Modified: trunk/app/views/layouts/_header.html.erb
===================================================================
--- trunk/app/views/layouts/_header.html.erb	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/app/views/layouts/_header.html.erb	2010-03-09 22:45:00 UTC (rev 1710)
@@ -57,7 +57,7 @@
       <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_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>
   </div>

Modified: trunk/app/views/logis/_navigation_bar_peer_group_select.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_peer_group_select.html.erb	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/app/views/logis/_navigation_bar_peer_group_select.html.erb	2010-03-09 22:45:00 UTC (rev 1710)
@@ -1,3 +1,4 @@
+<!--
 <% form_for(:prefs_profile, nil, :url => select_prefs_profile_url,
     :html => {:id => "quick_select", :name => "quick_select"}) do |form| %>
   <p>
@@ -8,3 +9,4 @@
           :class => "styled", : "$('quick_select').submit()" %>
   </p>
 <% end %>
+-->

Modified: trunk/app/views/main_page/_cloud.html.erb
===================================================================
--- trunk/app/views/main_page/_cloud.html.erb	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/app/views/main_page/_cloud.html.erb	2010-03-09 22:45:00 UTC (rev 1710)
@@ -3,8 +3,8 @@
   <% render :layout => 'application/panel_with_tabs_ajax', :locals => {:tabs => [
         {:text => t('v.main_page.browse_tags'), :name => "tags", 
             :description => t('v.main_page.tags_most_more')},
-        {:text => t('v.main_page.popular_groups'), :name => "groups",
-            :description => t('v.main_page.groups_most_more')},
+#        {:text => t('v.main_page.popular_groups'), :name => "groups",
+#            :description => t('v.main_page.groups_most_more')},
         {:text => t('v.main_page.prolific_users'), :name => "users", 
             :description => t('v.main_page.users_most_more')}],
       :selected => selected, :id => "cloud", :update_selected => true} do %>

Modified: trunk/app/views/main_page/_new_users_or_groups.html.erb
===================================================================
--- trunk/app/views/main_page/_new_users_or_groups.html.erb	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/app/views/main_page/_new_users_or_groups.html.erb	2010-03-09 22:45:00 UTC (rev 1710)
@@ -3,8 +3,9 @@
   <% render :layout => 'application/panel_with_tabs_ajax', :locals => {:tabs => [
           {:text => t('v.main_page.new_users'), :name => "new_users",
               :description => t('v.main_page.users_just')},
-          {:text => t('v.main_page.new_groups'), :name => "new_groups",
-              :description => t('v.main_page.groups_just')}],
+#          {:text => t('v.main_page.new_groups'), :name => "new_groups",
+#              :description => t('v.main_page.groups_just')}
+              ],
       :selected => selected, :id => "newering", :update_selected => true} do %>
     <% if selected == "new_users"%>
         <p><%= link_to t('v.main_page.view_all_users'), users_url() %></p>

Modified: trunk/app/views/users/edit.html.erb
===================================================================
--- trunk/app/views/users/edit.html.erb	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/app/views/users/edit.html.erb	2010-03-09 22:45:00 UTC (rev 1710)
@@ -2,8 +2,8 @@
   <% render :layout => 'application/panel_with_header', :locals => {
       :title => t('v.users.edit_account')} do %>
     <ul>
-      <li><%= t('v.users.select_default_peer_group') %></li>
-      <li><%= t('v.users.create_edit_invite_peer_groups') %></li>
+<!--      <li><%= t('v.users.select_default_peer_group') %></li> -->
+<!--     <li><%= t('v.users.create_edit_invite_peer_groups') %></li> -->
       <li><%= t('v.users.change_account_settings') %></li>
     </ul>
     <%= back_button %>
@@ -12,6 +12,7 @@
   <%= show_flash %>
   <%= show_errors 'user', 'prefs_profile' %>
 
+<!--
   <% render :layout => 'application/panel_with_header', :locals => {
       :title => t('v.users.default_peer_group')} do %>
     <% form_for(@user, :html => {:id => "peer_group_form"}) do |form| %>
@@ -33,7 +34,7 @@
     <p><%= t('v.users.edit_create') + ' ' + link_to(t('defaults.click_here'),
         peer_group_admin_memberships_url()) %></p>
   <% end %>
-
+-->
   <% render :layout => 'application/panel_with_header', :locals => {
       :title => t('v.users.settings')} do %>
     <% form_for(@user, :html => {:id => "email_form"}) do |form| %>

Modified: trunk/config/locales/en.yml
===================================================================
--- trunk/config/locales/en.yml	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/config/locales/en.yml	2010-03-09 22:45:00 UTC (rev 1710)
@@ -615,7 +615,7 @@
       needs_javascript: "{{link}} needs Javascript enabled, and only works in {{firefox_open}}Firefox 3{{link_close}}, and in Internet Explorer 7."
       preferences: Preferences
       second_version: "The second version of LogiLogi, now in public beta."
-      signup: "Signup for a new account"
+      signup: "Signup for account"
       title_line: "Philosophy beyond the Book"
       topics_and_logis: "Topics & logis"
       user_page: "User page"
@@ -790,7 +790,7 @@
     notifier: 
       dear: "Dear {{name}},"
       did_visit: "If you did make this request just visit the link below:"
-      email_and_password_login: "And you can login with your e-mail address and the password you provided."
+      email_and_password_login: "You can login with your e-mail address and the password you provided."
       find_more: "You can find more on LogiLogi at:"
       for_information_visit: "For more information on the {{group_name}} peergroup, visit its group page on:"
       happy_welcome: "We are happy to welcome you to {{domain}}."
@@ -805,7 +805,7 @@
       not_work_contact: "If you continue to have problem please feel free to contact us at {{admin_email}}."
       not_work_paste: "If the invitation URL does not work try copying and pasting it into your browser."
       only_happened: "It is only sent if something happened related to your logis."
-      open_id_login: "And you can login with your OpenID."
+      open_id_login: "You can login with your OpenID."
       please_bear: "Please bear with us that LogiLogi is still in public alpha, and not everything might be working perfectly yet."
       please_contact: "If you encounter any problem please contact us at {{admin_email}}."
       reset_request: "A request to reset your password for {{domain}} has been made."
@@ -823,7 +823,7 @@
     peer_group_admin_memberships: 
       can_create_here: "You can create a peergroup here."
       can_edit: "You can edit peergroups you founded."
-      can_start: "And you can start a new peergroup."
+      can_start: "You can start a new peergroup."
       click_to_edit: "Click on a peergroup to edit it."
       not_founded: "You have not founded any peergroups."
       your_peer_groups: "Your peergroups"
@@ -900,7 +900,7 @@
       activity: Activity
       api_key: "API key"
       api_key_is_label: "Your API-key is:"
-      change_account_settings: "And you can change your account settings."
+      change_account_settings: "You can change your account settings."
       create_edit_invite_peer_groups: "Create, edit and invite people to peergroups."
       created_logis_label: "Created logis:"
       default_peer_group: "Default peergroup"

Added: trunk/db/migrate/20100309223143_temporarily_disable_groups.rb
===================================================================
--- trunk/db/migrate/20100309223143_temporarily_disable_groups.rb	                        (rev 0)
+++ trunk/db/migrate/20100309223143_temporarily_disable_groups.rb	2010-03-09 22:45:00 UTC (rev 1710)
@@ -0,0 +1,17 @@
+class TemporarilyDisableGroups < ActiveRecord::Migration
+  def self.up
+    if GlobalConfig.available?
+      TemporarilyDisableGroups.update
+    end
+  end
+
+  def self.down
+  end
+
+  def self.update
+    PrefsProfile.find(:all).each do |profile|
+      profile.default_peer_group = PeerGroup.public
+      profile.save
+    end
+  end
+end

Modified: trunk/db/schema.rb
===================================================================
--- trunk/db/schema.rb	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/db/schema.rb	2010-03-09 22:45:00 UTC (rev 1710)
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100220183615) do
+ActiveRecord::Schema.define(:version => 20100309223143) do
 
   create_table "acts_as_xapian_jobs", :force => true do |t|
     t.string  "model",    :null => false

Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css	2010-03-09 20:19:57 UTC (rev 1709)
+++ trunk/public/stylesheets/logilogi.css	2010-03-09 22:45:00 UTC (rev 1710)
@@ -558,14 +558,14 @@
   border-color: white;
 }
 #top_search {
-  margin-right: 1.8em;
+  margin-right: 1em;
   float: right;
 }
 #top_search #top_search_query {
   margin-top: 0.4em;
   padding: 0.3em;
   float: left;
-  width: 10em;
+  width: 8em;
 }
 #top_search #top_search_button {
   margin-top: 0.4em;


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


