@@ -20,6 +20,7 @@ db/schema.sql db/*.sqlite3* config/database.yml public/photos/* +public/robots.txt public/thumbnails uuid.state nbproject* @@ -38,3 +39,4 @@ config/ultrasphinx/*.conf configure*.sh db/backup db/backup/* +public/robots.txt .gitignore @@ -15,7 +15,7 @@ class EventAttendee < ActiveRecord::Base belongs_to :event, :counter_cache => true validates_uniqueness_of :person_id, :scope => :event_id - after_create :log_activity + # after_create :log_activity def log_activity add_activities(:item => self, :person => self.person) app/models/event_attendee.rb @@ -27,7 +27,7 @@ class ForumPost < Post validates_presence_of :body, :person validates_length_of :body, :maximum => 5000 - after_create :log_activity + # after_create :log_activity private app/models/forum_post.rb @@ -1,12 +1,14 @@ <li> - <a class="categoryMenuItem" href="#<%= category_counter + 1 %>" title="" name="<%= category_counter + 1 %>"><%= category.name %> <span class='meta'><%= "(#{category.num_requests})" unless category.num_requests==0 %></span></a> + <%= link_to category.name, category, {:class => "categoryMenuItem" } %> + <!-- <a class="categoryMenuItem" href="#<%= category_counter + 1 %>" title="" name="<%= category_counter + 1 %>"> --> + <!-- <%= category.name %> --> <span class='meta'><%= "(#{category.num_requests})" unless category.num_requests==0 %></span> + <!-- </a> --> <div> <ul> <% if category.children.empty? -%> - <li><%= link_to 'General', category %> <span class="meta"><%= "(#{category.num_requests})" unless category.num_requests==0 %></span></li> - <br> + <!-- <li><%= link_to 'General', category %> <span class="meta"><%= "(#{category.num_requests})" unless category.num_requests==0 %></span></li> --> <% else -%> - <li><%= link_to 'General', category %> <span class="meta"><%= "(#{category.num_requests})" unless category.num_requests==0 %></span></li> + <!-- <li><%= link_to 'General', category %> <span class="meta"><%= "(#{category.num_requests})" unless category.num_requests==0 %></span></li> --> <%= render :partial => 'subcategory', :collection => category.children %> <% end -%> </ul> app/views/categories/_category.html.erb @@ -1,22 +1,18 @@ -<% content_for(:jquery_support) do %> -<%= javascript_include_tag 'jquery-1.2.6' %> -<%= javascript_include_tag 'jquery-ui-personalized-1.6rc2.min' %> -<script type="text/javascript"> - jQuery.noConflict(); -</script> -<%= javascript_include_tag 'cat_accordion' %> -<% end -%> -<h2 style="margin-bottom:0px">SkillBank Categories</h2> + + <%- if logged_in? and current_person.admin? -%> <%= render :partial => 'shared/add_category_button' %> <%- end -%> -<%- column_div :type => :primary do -%> + + +<h2 style="margin-bottom:0px">SkillBank Categories</h2> + +<div class="categorycol"> <%- if @top_level_categories.empty? -%> <h3 class="blankslate">No categories (yet!)</h3> <%- else -%> <% halfish = ((@top_level_categories.length)/2).floor %> - <div style='position:relative;padding-top:5px;height:600px'> <ul id="categoryMenu" class="categories"> <%= render :partial => 'category', :collection => @top_level_categories[0,halfish] %> </ul> @@ -24,10 +20,10 @@ <%= render :partial => 'category', :collection => @top_level_categories[-halfish,halfish] %> </ul> <br /> - </div> <%- end -%> -<%- end -%> +</div> + app/views/categories/index.html.erb @@ -1,6 +1,7 @@ +<h1>An open web-based network designed to foster community interaction<br /> through the exchange of a community currency<span></h1> + <%- column_div :type => :primary do -%> -<h1>An open web-based network designed to foster community interaction<br /> through the exchange of a community currency<span></h1> <p style="text-align:center"> <img class="flow" src="images/flowcircle.png" /> @@ -53,6 +54,17 @@ --> + + + +<%- end -%> + + +<%- column_div :type => :secondary do -%> + + + + <h2>login</h2> <% form_tag session_path do -%> @@ -84,17 +96,6 @@ -<%- end -%> - - -<%- column_div :type => :secondary do -%> - - - - - - - <% end %> app/views/sessions/new.html.erb @@ -14,13 +14,13 @@ namespace :db do sh "mysqldump -u #{db_config['username']} #{pass} #{db_config['database']} -Q --add-drop-table -O add-locks=FALSE -O lock-tables=FALSE | gzip -c > #{backup_file}" dir = Dir.new(backup_base) all_backups = dir.entries[2..-1].sort.reverse - puts "Created backup: #{backup_file}" + # puts "Created backup: #{backup_file}" max_backups = (ENV["MAX"] || 20).to_i unwanted_backups = all_backups[max_backups..-1] || [] for unwanted_backup in unwanted_backups FileUtils.rm_rf(File.join(backup_base, unwanted_backup)) - puts "deleted #{unwanted_backup}" + # puts "deleted #{unwanted_backup}" end - puts "Deleted #{unwanted_backups.length} backups, #{all_backups.length - unwanted_backups.length} backups available" + # puts "Deleted #{unwanted_backups.length} backups, #{all_backups.length - unwanted_backups.length} backups available" end end lib/tasks/backup.rake @@ -435,9 +435,12 @@ ul.categories li.selected a } ul.categories a.categoryMenuItem, ul.categories li.selected a.selected { - text-decoration:none; color:#777; } +a.categoryMenuItem:hover +{ + text-decoration:underline; +} ul.categories li ul li { border:0px; @@ -655,20 +658,19 @@ a.meta, .meta a { } - +.categorycol +{ + padding-top:20px; +} #categoryMenu { - position:absolute; - top:20px; - left:10px; - width:390px; + float:left; + width:410px; } #categoryMenu2 { - position:absolute; - top:20px; - width:390px; - left:420px; + float:left; + width:410px; } .blog h3, .blog h3 a, .blog h3 a:visited @@ -924,11 +926,6 @@ body.home blockquote p -body.login .col1 -{ - width:auto; - float:none; -} body.login h1 { font-size:23px; public/stylesheets/skin.css 7eb82bfb057aed3f69599aeffb89983a58e17205 BinarySeed binaryseed@hardy2.(none) http://github.com/binaryseed/oscurrency/commit/d093c282f45ad8a30139ee9fa634278f1a253076 d093c282f45ad8a30139ee9fa634278f1a253076 2009-04-22T13:51:35-07:00 2009-04-22T13:51:35-07:00 front page, categories mods 9585f01ac424809fefb955164c8f1ec93c4cfaa5 BinarySeed binaryseed@hardy2.(none)