<%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) diff -r 97a00e2e145d -r b9e34a051f82 app/views/attachments/_links.html.erb --- a/app/views/attachments/_links.html.erb Tue Oct 16 15:25:01 2012 +0100 +++ b/app/views/attachments/_links.html.erb Wed Nov 21 17:56:50 2012 +0000 @@ -2,7 +2,7 @@ <% for attachment in attachments %>
<%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
<%= h(" - #{attachment.description}") unless attachment.description.blank? %>
- (<%= number_to_human_size attachment.filesize %>)
+ <%= number_to_human_size attachment.filesize %><%= ", " + l(:label_x_downloads, :count => attachment.downloads) unless attachment.downloads == 0 %>
<% if options[:deletable] %>
<%= link_to image_tag('delete.png'), attachment_path(attachment),
:confirm => l(:text_are_you_sure),
diff -r 97a00e2e145d -r b9e34a051f82 app/views/projects/_form.html.erb
--- a/app/views/projects/_form.html.erb Tue Oct 16 15:25:01 2012 +0100
+++ b/app/views/projects/_form.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -21,9 +21,20 @@
<%= l(:text_project_homepage_info) %>
<%= f.check_box :is_public %> +
+<%= label(:project, :is_public_1, l(:field_public_or_private) + content_tag("span", " *", :class => "required")) %>
+<%
+ # if the project hasn't been created fully yet, then we don't
+ # want to set either public or private (make the user decide)
+ initialised = !@project.id.nil?
+%>
+ <%= f.radio_button :is_public, 1, :checked => (initialised && @project.is_public?) %>
+ <%= l(:text_project_public_info) %>
- <%= l(:text_project_visibility_info) %>
+ <%= f.radio_button :is_public, 0, :checked => (initialised && !@project.is_public?) %>
+ <%= l(:text_project_private_info) %>
+
+ <%= l(:text_project_visibility_info) %>
-
+ <% for project in Project.latest(User.current) %>
+
- + + <% if !project.root? %> + <% project.ancestors.each do |p| %> + <%= h(p) %> » + <% end %> + <% end %> + <%= link_to_project project %> + + <% if !project.is_public? %> + <%= l(:field_is_private) %> + <% end %> + <%= format_time(project.created_on)%> + <%= render_project_short_description project %> + + <% end %> +
+
+
<% end %>
diff -r 97a00e2e145d -r b9e34a051f82 app/views/projects/explore.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/explore.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -0,0 +1,32 @@
+<% content_for :header_tags do %>
+ <%= stylesheet_link_tag 'redmine_tags', :plugin => 'redmine_tags' %>
+<% end %>
+
+<% cache(:action => 'explore', :action_suffix => 'tags', :expires_in => 1.hour) do %>
+<%=l(:label_member_plural)%>
<% @users_by_role.keys.sort.each do |role| %>
<%=h role %>: <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ") %>
<% end %>
<%= l(:label_explore_projects) %>
+ +<% end %> + +
+ <% cache(:action => 'explore', :action_suffix => 'busy_institutions', :expires_in => 1.hour) do %>
+
+
+
+ <% end %>
+ <%=l(:label_institutions_busy)%>
+ <%= render :partial => 'activities/busy_institution' %> +
+
+<%=l(:label_project_latest)%>
+ <%= render :partial => 'projects/latest' %> +
+ <% cache(:action => 'explore', :action_suffix => 'busy_projects', :expires_in => 1.hour) do %>
+
diff -r 97a00e2e145d -r b9e34a051f82 app/views/projects/new.html.erb
--- a/app/views/projects/new.html.erb Tue Oct 16 15:25:01 2012 +0100
+++ b/app/views/projects/new.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -3,6 +3,5 @@
<% labelled_tabular_form_for @project do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_create) %>
-<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
<%= javascript_tag "Form.Element.focus('project_name');" %>
<% end %>
diff -r 97a00e2e145d -r b9e34a051f82 app/views/welcome/index.html.erb
--- a/app/views/welcome/index.html.erb Tue Oct 16 15:25:01 2012 +0100
+++ b/app/views/welcome/index.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -14,40 +14,17 @@
+
+ <% end %>
+<%=l(:label_projects_busy)%>
+ <%= render :partial => 'activities/busy' %> +
<% if @site_news.any? %>
-
You can change it at any time, in the project's settings." - text_project_visibility_info: "If your project is not public, it will be visible only to you and to users that you have added as project members.
You can change this later if you wish." + text_project_public_info: "Public: visible to anybody browsing the site." + text_project_private_info: "Private: visible only to you, and to users you have added as project members." + text_project_visibility_info: "You can change whether your project is public or private later if you wish." text_user_ssamr_description_info: 'Please describe your current research or development interests.
This information will be used at registration to determine that you are a real person – so please be descriptive, or your application may be delayed or rejected.
After registration, the description is publicly visible in your profile and you can edit it at any time.' text_issue_parent_issue_info: 'If this is a subtask, please insert its parent task number or write the main task name.' diff -r 97a00e2e145d -r b9e34a051f82 config/routes.rb --- a/config/routes.rb Tue Oct 16 15:25:01 2012 +0100 +++ b/config/routes.rb Wed Nov 21 17:56:50 2012 +0000 @@ -32,6 +32,8 @@ # TODO: wasteful since this is also nested under issues, projects, and projects/issues map.resources :time_entries, :controller => 'timelog' + map.connect 'explore', :controller => 'projects', :action => 'explore' + map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post} map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get} map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post} diff -r 97a00e2e145d -r b9e34a051f82 extra/soundsoftware/extract-javadoc.sh --- a/extra/soundsoftware/extract-javadoc.sh Tue Oct 16 15:25:01 2012 +0100 +++ b/extra/soundsoftware/extract-javadoc.sh Wed Nov 21 17:56:50 2012 +0000 @@ -35,8 +35,8 @@ # package declarations find "$projectdir" -type f -name \*.java \ - -exec grep '^ *package [a-zA-Z][a-zA-Z0-9\._-]*; *$' \{\} /dev/null \; | - sed -e 's/\/[^\/]*: *package */:/' -e 's/; *$//' | + -exec egrep '^ *package +[a-zA-Z][a-zA-Z0-9\._-]*;.*$' \{\} /dev/null \; | + sed -e 's/\/[^\/]*: *package */:/' -e 's/;.*$//' | sort | uniq | ( current_prefix= current_packages= diff -r 97a00e2e145d -r b9e34a051f82 extra/soundsoftware/get-apache-log-stats.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/extra/soundsoftware/get-apache-log-stats.rb Wed Nov 21 17:56:50 2012 +0000 @@ -0,0 +1,179 @@ + +# Read an Apache log file in SoundSoftware site format from stdin and +# produce some per-project stats. +# +# Invoke with e.g. +# +# cat /var/log/apache2/code-access.log | \ +# script/runner -e production extra/soundsoftware/get-apache-log-stats.rb + + +# Use the ApacheLogRegex parser, a neat thing +# See http://www.simonecarletti.com/blog/2009/02/apache-log-regex-a-lightweight-ruby-apache-log-parser/ +require 'apachelogregex' + +# This is the format defined in our httpd.conf +vhost_combined_format = '%v:%p %h %{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"' + +parser = ApacheLogRegex.new(vhost_combined_format) + +# project name -> count of hg clones +clones = Hash.new(0) + +# project name -> count of hg pulls +pulls = Hash.new(0) + +# project name -> count of hg pushes +pushes = Hash.new(0) + +# project name -> count of hg archive requests (i.e. Download as Zip) +zips = Hash.new(0) + +# project name -> count of hits to pages under /projects/projectname +hits = Hash.new(0) + +# project name -> Project object +@projects = Hash.new + +parseable = 0 +unparseable = 0 + +def is_public_project?(project) + if !project + false + elsif project =~ /^\d+$/ + # ignore numerical project ids, they are only used when editing projects + false + elsif @projects.key?(project) + @projects[project].is_public? + else + pobj = Project.find_by_identifier(project) + if pobj + @projects[project] = pobj + pobj.is_public? + else + print "Project not found: ", project, "\n" + false + end + end +end + +def print_stats(h) + h.keys.sort { |a,b| h[b] <=> h[a] }.each do |p| + if h[p] > 0 + print h[p], " ", @projects[p].name, " [", p, "]\n" + end + end +end + +STDIN.each do |line| + + record = parser.parse(line) + + # most annoyingly, the parser can't handle the comma-separated list + # in X-Forwarded-For where it has more than one element. If it has + # failed, remove any IP addresses or the word "unknown" with + # trailing commas and try again + if not record + filtered = line.gsub(/(unknown|([0-9]+\.){3}[0-9]+),\s*/, "") + record = parser.parse(filtered) + end + + # discard, but count, unparseable lines + if not record + print "Line not parseable: ", line, "\n" + unparseable += 1 + next + end + + # discard everything that isn't a 200 OK response + next if record["%>s"] != "200" + + # discard anything apparently requested by a crawler + next if record["%{User-Agent}i"] =~ /(bot|slurp|crawler|spider|Redmine)\b/i + + # pull out request e.g. GET / HTTP/1.0 + request = record["%r"] + + # split into method, path, protocol + if not request =~ /^[^\s]+ ([^\s]+) [^\s]+$/ + print "Line not parseable (bad method, path, protocol): ", line, "\n" + unparseable += 1 + next + end + + # get the path e.g. /projects/weevilmatic and split on / + path = $~[1] + components = path.split("/") + + # should have at least two elements unless path is "/"; first should + # be empty (begins with /) + if path != "/" and (components.size < 2 or components[0] != "") + print "Line not parseable (degenerate path): ", line, "\n" + unparseable += 1 + next + end + + if components[1] == "hg" + + # path is /hg/project?something or /hg/project/something + + project = components[2].split("?")[0] + if not is_public_project?(project) + next + end + + if components[2] =~ /&roots=00*$/ + clones[project] += 1 + elsif components[2] =~ /cmd=capabilities/ + pulls[project] += 1 + elsif components[2] =~ /cmd=unbundle/ + pushes[project] += 1 + elsif components[3] == "archive" + zips[project] += 1 + end + + elsif components[1] == "projects" + + # path is /projects/project or /projects/project/something + + project = components[2] + project = project.split("?")[0] if project + if not is_public_project?(project) + next + end + + hits[project] += 1 + + end + + parseable += 1 +end + +# Each clone is also a pull; deduct it from the pulls hash, because we +# want that to contain only non-clone pulls + +clones.keys.each do |project| + pulls[project] -= 1 +end + +print parseable, " parseable\n" +print unparseable, " unparseable\n" + + +print "\nMercurial clones:\n" +print_stats clones + +print "\nMercurial pulls (excluding clones):\n" +print_stats pulls + +print "\nMercurial pushes:\n" +print_stats pushes + +print "\nMercurial archive (zip file) downloads:\n" +print_stats zips + +print "\nProject page hits (excluding crawlers):\n" +print_stats hits + + diff -r 97a00e2e145d -r b9e34a051f82 extra/soundsoftware/get-statistics.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/extra/soundsoftware/get-statistics.rb Wed Nov 21 17:56:50 2012 +0000 @@ -0,0 +1,147 @@ +# this script will get stats from the repo and print them to stdout + +# USAGE: + +# ./script/runner -e production extra/soundsoftware/get-statistics.rb +# + +d1 = Date.parse("20100701") # => 1 Jul 2010 +d2 = Date.today + +def delta_array (iarray) + # returns an array with the deltas + ## prepends a zero and drops the last element + deltas = [0] + iarray + deltas = deltas.first(deltas.size - 1) + + return iarray.zip(deltas).map { |x, y| x - y } + +end + +def months_between(d1, d2) + months = [] + start_date = Date.civil(d1.year, d1.month, 1) + end_date = Date.civil(d2.year, d2.month, 1) + + raise ArgumentError unless d1 <= d2 + + while (start_date < end_date) + months << start_date + start_date = start_date >>1 + end + + months << end_date +end + +def weeks_between(d1, d2) + weeks = [] + start_date = Date.civil(d1.year, d1.month, d1.day) + end_date = Date.civil(d2.year, d2.month, d2.day) + + raise ArgumentError unless d1 <= d2 + + while (start_date < end_date) + weeks << start_date + start_date = start_date + 2.week + end + + weeks << end_date +end + +def get_user_project_evol_stats() + # dates = months_between(d1, d2) + dates = months_between(d1, d2) + + # number of users + n_users = [] + n_projects = [] + qm_users = [] + + dates.each do |date| + users = User.find_by_sql ["SELECT * FROM users WHERE users.status = '1' AND users.created_on <= ?;", date] + projects = Project.find_by_sql ["SELECT * FROM projects WHERE projects.created_on <= ?;", date] + + qm_users_list = User.find_by_sql ["SELECT * FROM users,ssamr_user_details WHERE users.status = '1' AND ssamr_user_details.user_id = users.id AND (users.mail like '%qmul%' OR ssamr_user_details.institution_id = '99') AND users.created_on <= ?;", date ] + + qm_users << qm_users_list.count + n_users << users.count + n_projects << projects.count + + # private_projects = Project.find(:all, :conditions => {:created_on => d1..date, is_public => false}) + end + + user_deltas = delta_array(n_users) + proj_deltas = delta_array(n_projects) + qm_user_deltas = delta_array(qm_users) + + puts "Date Users D_Users QM_Users D_QM_users Projects D_Projects" + + dates.zip(n_users, user_deltas, qm_users, qm_user_deltas, n_projects, proj_deltas).each do |a, b, c, d, e, f, g| + puts "#{a} #{b} #{c} #{d} #{e} #{f} #{g}" + end + +end + + +def get_project_status() + date = "20121101" + + all_projects = Project.find(:all, :conditions => ["created_on < ?", date]) + # all_projects = Project.find(:all, :conditions => ["is_public = ? AND created_on < ?", true, date]) +# all_projects = Project.find(:all, :conditions => ["is_public = ? AND created_on < ?", false, date]) + + collab = [] + users_per_proj = [] + + # puts "Public Users Institutions" + + all_projects.each do |proj| + insts = [] + + proj.users.each do |u| + if u.institution == "" || u.institution == "No Institution Set" + if u.mail.include?("qmul.ac.uk") || u.mail.include?("andrewrobertson77") + insts << "Queen Mary, University of London" + else + insts << u.mail + end + else + insts << u.institution + end + end + + users_per_proj << proj.users.count + collab << insts.uniq.count + end + + + # freq = collab.inject(Hash.new(0)) { |h,v| h[v] += 1; h } + # freq = freq.sort_by {|key, value| value} + # puts freq.inspect.sort + + puts "Projects: #{all_projects.count} UpP: #{users_per_proj.sum / users_per_proj.size.to_f} Users1+: #{users_per_proj.count{|x| x> 1}} Users2+: #{users_per_proj.count{|x| x> 2}} Collab1+: #{collab.count{|x| x > 1}} Collab2+: #{collab.count{|x| x > 2}} IpP: #{collab.sum / collab.size.to_f}" +end + +def get_user_projects_ratios() + user_projects = User.find(:all, :conditions=> {:status => 1}) + pub_proj_user = user_projects.map{|u| u.projects.find(:all, :conditions=>{:is_public => true}).count} + + user_projects.zip(pub_proj_user).each do |u, pub| + puts "#{u.projects.count} #{pub}" + end + +end + +def get_inst_list() + users = User.find(:all, :conditions => {:status => 1}) + inst_list = users.map{|user| user.institution} + + freq = inst_list.inject(Hash.new(0)) { |h,v| h[v] += 1; h } + +end + + +# get_user_projects_ratios() +# get_user_project_evol_stats() + +get_project_status() diff -r 97a00e2e145d -r b9e34a051f82 public/help/wiki_syntax.html --- a/public/help/wiki_syntax.html Tue Oct 16 15:25:01 2012 +0100 +++ b/public/help/wiki_syntax.html Wed Nov 21 17:56:50 2012 +0000 @@ -44,11 +44,15 @@
h2. Title 2 
h3. Title 3 Table of contents Left-aligned table of contents Right-aligned table of contents Links http://foo.bar http://foo.bar "Foo":http://foo.bar Foo Redmine links Magic links 
[[Wiki page]] Wiki page Issue #12 Issue #12 Revision r43 Revision r43
' end end - s + s end - + def choose_author_link(object_name, items) # called by autocomplete_for_author (publications' action/view) # creates the select list based on the results array # results is an array with both Users and Authorships objects - + @author_options = [] @results.each do |result| email_bit = result.mail.partition('@')[2] @@ -34,26 +34,26 @@ end @author_options << ["#{result.name} #{email_bit}", "#{result.class.to_s}_#{result.id.to_s}"] end - + if @results.size > 0 s = select_tag( form_tag_name(object_name, :author_search_results), options_for_select(@author_options), { :id => form_tag_id(object_name, :author_search_results), :size => 3} ) s << observe_field( form_tag_id(object_name, :author_search_results), :on => 'click', :function => "alert('Element changed')", :with => 'q') else s = "No Authors found that match your search… sorry!" - end + end end def link_to_remove_fields(name, f) f.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)", :class => 'icon icon-del') end - + def link_to_add_author_fields(name, f, association, action) new_object = f.object.class.reflect_on_association(association).klass.new fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder| render(association.to_s.singularize + "_fields", :f => builder) - end + end link_to_function(name, h("add_author_fields(this, '#{association}', '#{escape_javascript(fields)}', '#{action}')"), { :class => 'icon icon-add', :id => "add_another_author" }) - end + end def sanitized_object_name(object_name) object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/,"_").sub(/_$/,"") @@ -62,64 +62,77 @@ def sanitized_method_name(method_name) method_name.sub(/\?$/, "") end - + def form_tag_name(object_name, method_name) str = "#{object_name.to_s}[#{sanitized_method_name(method_name.to_s)}]" - str.to_sym + str.to_sym end - - def form_tag_id(object_name, method_name) + + def form_tag_id(object_name, method_name) str = "#{sanitized_object_name(object_name.to_s)}_#{sanitized_method_name(method_name.to_s)}" str.to_sym end - + def form_object_id(object_name) str = object_name.split("\[").last().gsub("\]","") str.to_sym end - def render_authorships_list(publication) + def render_authorships_list(publication) s = '
" - end - s + s << "
" + end + + s end - + + def print_ieee_format(publication) + Rails.cache.fetch("publication-#{publication.id}-ieee") do + publication.print_entry(:ieee) + end + end + + def print_bibtex_format(publication) + Rails.cache.fetch("publication-#{publication.id}-bibtex") do + publication.print_entry(:bibtex) + end + end + + def show_bibtex_fields(bibtex_entry) s = "" bibtex_entry.attributes.keys.sort.each do |key| value = bibtex_entry.attributes[key].to_s next if key == 'id' or key == 'publication_id' or value == "" - s << "
-<% end %>
+<% end -%>
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/app/views/publications/_form.html.erb
--- a/vendor/plugins/redmine_bibliography/app/views/publications/_form.html.erb Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/_form.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -1,8 +1,8 @@
-<%= f.error_messages %>
+<%= f.error_messages %>
-
- <% end %>
<%= call_hook(:view_welcome_index_right, :projects => @projects) %>
diff -r 97a00e2e145d -r b9e34a051f82 config/environment.rb
--- a/config/environment.rb Tue Oct 16 15:25:01 2012 +0100
+++ b/config/environment.rb Wed Nov 21 17:56:50 2012 +0000
@@ -36,7 +36,10 @@
# Enable page/fragment caching by setting a file-based store
# (remember to create the caching directory and make it readable to the application)
- # config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
+ config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
+
+ # And for direct uses of the cache
+ config.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
# Activate observers that should always be running
# config.active_record.observers = :cacher, :garbage_collector
diff -r 97a00e2e145d -r b9e34a051f82 config/locales/en.yml
--- a/config/locales/en.yml Tue Oct 16 15:25:01 2012 +0100
+++ b/config/locales/en.yml Wed Nov 21 17:56:50 2012 +0000
@@ -130,6 +130,7 @@
circular_dependency: "This relation would create a circular dependency"
cant_link_an_issue_with_a_descendant: "An issue cannot be linked to one of its subtasks"
must_accept_terms_and_conditions: "You must accept the Terms and Conditions"
+ public_or_private: "You must select either public or private"
actionview_instancetag_blank_option: Please select
@@ -328,6 +329,7 @@
field_root_directory: Root directory
field_cvsroot: CVSROOT
field_cvs_module: Module
+ field_public_or_private: "Public or Private?"
setting_external_repository: "Select this if the project's main repository is hosted somewhere else"
setting_external_repository_url: "The URL of the existing external repository. Must be publicly accessible without a password"
@@ -487,9 +489,16 @@
zero: no projects
one: 1 project
other: "%{count} projects"
+ label_x_downloads:
+ zero: never downloaded
+ one: downloaded once
+ other: "downloaded %{count} times"
label_project_all: All Projects
label_project_latest: Latest projects
label_projects_more: More projects
+ label_project_tags_all: Popular tags
+ label_projects_busy: Busy projects
+ label_institutions_busy: Active institutions
label_managers: Managed by
label_issue: Issue
label_issue_new: New issue
@@ -539,7 +548,7 @@
label_home: Home
label_home_heading: Welcome!
label_my_page: My page
- label_my_account: My account
+ label_my_account: Account
label_my_projects: My projects
label_my_page_block: My page block
label_administration: Administration
@@ -556,6 +565,7 @@
label_activity_my_recent_none: No recent activity
label_overall_activity: Overall activity
label_user_activity: "%{value}'s activity"
+ label_institution_activity: "Activity from %{value}"
label_new: New
label_logged_as: Logged in as
label_environment: Environment
@@ -685,7 +695,7 @@
label_repository: Repository
label_is_external_repository: Track an external repository
label_repository_plural: Repositories
- label_browse: Browse
+ label_explore_projects: Explore projects
label_modification: "%{count} change"
label_modification_plural: "%{count} changes"
label_branch: Branch
@@ -883,7 +893,7 @@
button_expand_all: Expand all
button_delete: Delete
button_create: Create
- button_create_and_continue: Create and continue
+ button_create_and_continue: Create and Add Another
button_test: Test
button_edit: Edit
button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
@@ -958,7 +968,9 @@
text_caracters_minimum: "Must be at least %{count} characters long."
text_length_between: "Length between %{min} and %{max} characters."
text_project_name_info: "This will be the name of your project as it appears throughout this site.<%=l(:label_news_site_latest)%>
+
+
<% end %>
- <% if @projects.any? %>
<%=l(:label_news_site_latest)%>
<%= render :partial => 'news/news', :locals => { :project => @site_project }, :collection => @site_news %> - <%= link_to l(:label_news_more), { :controller => 'projects', :action => @site_project.identifier, :id => 'news' } %><%=l(:label_project_latest)%>
--
- <% for project in @projects %>
- <% @project = project %>
-
- - - <% if !project.root? %> - <% project.ancestors.each do |p| %> - <%= h(p) %> » - <% end %> - <% end %> - <%= link_to_project project %> - - <% if !project.is_public? %> - <%= l(:field_is_private) %> - <% end %> - <%= format_time(project.created_on)%> - <%= render_project_short_description project %> - - <% end %> - <% @project = nil %> -
You can change it at any time, in the project's settings." - text_project_visibility_info: "If your project is not public, it will be visible only to you and to users that you have added as project members.
You can change this later if you wish." + text_project_public_info: "Public: visible to anybody browsing the site." + text_project_private_info: "Private: visible only to you, and to users you have added as project members." + text_project_visibility_info: "You can change whether your project is public or private later if you wish." text_user_ssamr_description_info: 'Please describe your current research or development interests.
This information will be used at registration to determine that you are a real person – so please be descriptive, or your application may be delayed or rejected.
After registration, the description is publicly visible in your profile and you can edit it at any time.' text_issue_parent_issue_info: 'If this is a subtask, please insert its parent task number or write the main task name.' diff -r 97a00e2e145d -r b9e34a051f82 config/routes.rb --- a/config/routes.rb Tue Oct 16 15:25:01 2012 +0100 +++ b/config/routes.rb Wed Nov 21 17:56:50 2012 +0000 @@ -32,6 +32,8 @@ # TODO: wasteful since this is also nested under issues, projects, and projects/issues map.resources :time_entries, :controller => 'timelog' + map.connect 'explore', :controller => 'projects', :action => 'explore' + map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post} map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get} map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post} diff -r 97a00e2e145d -r b9e34a051f82 extra/soundsoftware/extract-javadoc.sh --- a/extra/soundsoftware/extract-javadoc.sh Tue Oct 16 15:25:01 2012 +0100 +++ b/extra/soundsoftware/extract-javadoc.sh Wed Nov 21 17:56:50 2012 +0000 @@ -35,8 +35,8 @@ # package declarations find "$projectdir" -type f -name \*.java \ - -exec grep '^ *package [a-zA-Z][a-zA-Z0-9\._-]*; *$' \{\} /dev/null \; | - sed -e 's/\/[^\/]*: *package */:/' -e 's/; *$//' | + -exec egrep '^ *package +[a-zA-Z][a-zA-Z0-9\._-]*;.*$' \{\} /dev/null \; | + sed -e 's/\/[^\/]*: *package */:/' -e 's/;.*$//' | sort | uniq | ( current_prefix= current_packages= diff -r 97a00e2e145d -r b9e34a051f82 extra/soundsoftware/get-apache-log-stats.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/extra/soundsoftware/get-apache-log-stats.rb Wed Nov 21 17:56:50 2012 +0000 @@ -0,0 +1,179 @@ + +# Read an Apache log file in SoundSoftware site format from stdin and +# produce some per-project stats. +# +# Invoke with e.g. +# +# cat /var/log/apache2/code-access.log | \ +# script/runner -e production extra/soundsoftware/get-apache-log-stats.rb + + +# Use the ApacheLogRegex parser, a neat thing +# See http://www.simonecarletti.com/blog/2009/02/apache-log-regex-a-lightweight-ruby-apache-log-parser/ +require 'apachelogregex' + +# This is the format defined in our httpd.conf +vhost_combined_format = '%v:%p %h %{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"' + +parser = ApacheLogRegex.new(vhost_combined_format) + +# project name -> count of hg clones +clones = Hash.new(0) + +# project name -> count of hg pulls +pulls = Hash.new(0) + +# project name -> count of hg pushes +pushes = Hash.new(0) + +# project name -> count of hg archive requests (i.e. Download as Zip) +zips = Hash.new(0) + +# project name -> count of hits to pages under /projects/projectname +hits = Hash.new(0) + +# project name -> Project object +@projects = Hash.new + +parseable = 0 +unparseable = 0 + +def is_public_project?(project) + if !project + false + elsif project =~ /^\d+$/ + # ignore numerical project ids, they are only used when editing projects + false + elsif @projects.key?(project) + @projects[project].is_public? + else + pobj = Project.find_by_identifier(project) + if pobj + @projects[project] = pobj + pobj.is_public? + else + print "Project not found: ", project, "\n" + false + end + end +end + +def print_stats(h) + h.keys.sort { |a,b| h[b] <=> h[a] }.each do |p| + if h[p] > 0 + print h[p], " ", @projects[p].name, " [", p, "]\n" + end + end +end + +STDIN.each do |line| + + record = parser.parse(line) + + # most annoyingly, the parser can't handle the comma-separated list + # in X-Forwarded-For where it has more than one element. If it has + # failed, remove any IP addresses or the word "unknown" with + # trailing commas and try again + if not record + filtered = line.gsub(/(unknown|([0-9]+\.){3}[0-9]+),\s*/, "") + record = parser.parse(filtered) + end + + # discard, but count, unparseable lines + if not record + print "Line not parseable: ", line, "\n" + unparseable += 1 + next + end + + # discard everything that isn't a 200 OK response + next if record["%>s"] != "200" + + # discard anything apparently requested by a crawler + next if record["%{User-Agent}i"] =~ /(bot|slurp|crawler|spider|Redmine)\b/i + + # pull out request e.g. GET / HTTP/1.0 + request = record["%r"] + + # split into method, path, protocol + if not request =~ /^[^\s]+ ([^\s]+) [^\s]+$/ + print "Line not parseable (bad method, path, protocol): ", line, "\n" + unparseable += 1 + next + end + + # get the path e.g. /projects/weevilmatic and split on / + path = $~[1] + components = path.split("/") + + # should have at least two elements unless path is "/"; first should + # be empty (begins with /) + if path != "/" and (components.size < 2 or components[0] != "") + print "Line not parseable (degenerate path): ", line, "\n" + unparseable += 1 + next + end + + if components[1] == "hg" + + # path is /hg/project?something or /hg/project/something + + project = components[2].split("?")[0] + if not is_public_project?(project) + next + end + + if components[2] =~ /&roots=00*$/ + clones[project] += 1 + elsif components[2] =~ /cmd=capabilities/ + pulls[project] += 1 + elsif components[2] =~ /cmd=unbundle/ + pushes[project] += 1 + elsif components[3] == "archive" + zips[project] += 1 + end + + elsif components[1] == "projects" + + # path is /projects/project or /projects/project/something + + project = components[2] + project = project.split("?")[0] if project + if not is_public_project?(project) + next + end + + hits[project] += 1 + + end + + parseable += 1 +end + +# Each clone is also a pull; deduct it from the pulls hash, because we +# want that to contain only non-clone pulls + +clones.keys.each do |project| + pulls[project] -= 1 +end + +print parseable, " parseable\n" +print unparseable, " unparseable\n" + + +print "\nMercurial clones:\n" +print_stats clones + +print "\nMercurial pulls (excluding clones):\n" +print_stats pulls + +print "\nMercurial pushes:\n" +print_stats pushes + +print "\nMercurial archive (zip file) downloads:\n" +print_stats zips + +print "\nProject page hits (excluding crawlers):\n" +print_stats hits + + diff -r 97a00e2e145d -r b9e34a051f82 extra/soundsoftware/get-statistics.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/extra/soundsoftware/get-statistics.rb Wed Nov 21 17:56:50 2012 +0000 @@ -0,0 +1,147 @@ +# this script will get stats from the repo and print them to stdout + +# USAGE: + +# ./script/runner -e production extra/soundsoftware/get-statistics.rb +# + +d1 = Date.parse("20100701") # => 1 Jul 2010 +d2 = Date.today + +def delta_array (iarray) + # returns an array with the deltas + ## prepends a zero and drops the last element + deltas = [0] + iarray + deltas = deltas.first(deltas.size - 1) + + return iarray.zip(deltas).map { |x, y| x - y } + +end + +def months_between(d1, d2) + months = [] + start_date = Date.civil(d1.year, d1.month, 1) + end_date = Date.civil(d2.year, d2.month, 1) + + raise ArgumentError unless d1 <= d2 + + while (start_date < end_date) + months << start_date + start_date = start_date >>1 + end + + months << end_date +end + +def weeks_between(d1, d2) + weeks = [] + start_date = Date.civil(d1.year, d1.month, d1.day) + end_date = Date.civil(d2.year, d2.month, d2.day) + + raise ArgumentError unless d1 <= d2 + + while (start_date < end_date) + weeks << start_date + start_date = start_date + 2.week + end + + weeks << end_date +end + +def get_user_project_evol_stats() + # dates = months_between(d1, d2) + dates = months_between(d1, d2) + + # number of users + n_users = [] + n_projects = [] + qm_users = [] + + dates.each do |date| + users = User.find_by_sql ["SELECT * FROM users WHERE users.status = '1' AND users.created_on <= ?;", date] + projects = Project.find_by_sql ["SELECT * FROM projects WHERE projects.created_on <= ?;", date] + + qm_users_list = User.find_by_sql ["SELECT * FROM users,ssamr_user_details WHERE users.status = '1' AND ssamr_user_details.user_id = users.id AND (users.mail like '%qmul%' OR ssamr_user_details.institution_id = '99') AND users.created_on <= ?;", date ] + + qm_users << qm_users_list.count + n_users << users.count + n_projects << projects.count + + # private_projects = Project.find(:all, :conditions => {:created_on => d1..date, is_public => false}) + end + + user_deltas = delta_array(n_users) + proj_deltas = delta_array(n_projects) + qm_user_deltas = delta_array(qm_users) + + puts "Date Users D_Users QM_Users D_QM_users Projects D_Projects" + + dates.zip(n_users, user_deltas, qm_users, qm_user_deltas, n_projects, proj_deltas).each do |a, b, c, d, e, f, g| + puts "#{a} #{b} #{c} #{d} #{e} #{f} #{g}" + end + +end + + +def get_project_status() + date = "20121101" + + all_projects = Project.find(:all, :conditions => ["created_on < ?", date]) + # all_projects = Project.find(:all, :conditions => ["is_public = ? AND created_on < ?", true, date]) +# all_projects = Project.find(:all, :conditions => ["is_public = ? AND created_on < ?", false, date]) + + collab = [] + users_per_proj = [] + + # puts "Public Users Institutions" + + all_projects.each do |proj| + insts = [] + + proj.users.each do |u| + if u.institution == "" || u.institution == "No Institution Set" + if u.mail.include?("qmul.ac.uk") || u.mail.include?("andrewrobertson77") + insts << "Queen Mary, University of London" + else + insts << u.mail + end + else + insts << u.institution + end + end + + users_per_proj << proj.users.count + collab << insts.uniq.count + end + + + # freq = collab.inject(Hash.new(0)) { |h,v| h[v] += 1; h } + # freq = freq.sort_by {|key, value| value} + # puts freq.inspect.sort + + puts "Projects: #{all_projects.count} UpP: #{users_per_proj.sum / users_per_proj.size.to_f} Users1+: #{users_per_proj.count{|x| x> 1}} Users2+: #{users_per_proj.count{|x| x> 2}} Collab1+: #{collab.count{|x| x > 1}} Collab2+: #{collab.count{|x| x > 2}} IpP: #{collab.sum / collab.size.to_f}" +end + +def get_user_projects_ratios() + user_projects = User.find(:all, :conditions=> {:status => 1}) + pub_proj_user = user_projects.map{|u| u.projects.find(:all, :conditions=>{:is_public => true}).count} + + user_projects.zip(pub_proj_user).each do |u, pub| + puts "#{u.projects.count} #{pub}" + end + +end + +def get_inst_list() + users = User.find(:all, :conditions => {:status => 1}) + inst_list = users.map{|user| user.institution} + + freq = inst_list.inject(Hash.new(0)) { |h,v| h[v] += 1; h } + +end + + +# get_user_projects_ratios() +# get_user_project_evol_stats() + +get_project_status() diff -r 97a00e2e145d -r b9e34a051f82 public/help/wiki_syntax.html --- a/public/help/wiki_syntax.html Tue Oct 16 15:25:01 2012 +0100 +++ b/public/help/wiki_syntax.html Wed Nov 21 17:56:50 2012 +0000 @@ -44,11 +44,15 @@
Title 2
Title 3
{{toc}}{{>toc}}' end end - s + s end - + def choose_author_link(object_name, items) # called by autocomplete_for_author (publications' action/view) # creates the select list based on the results array # results is an array with both Users and Authorships objects - + @author_options = [] @results.each do |result| email_bit = result.mail.partition('@')[2] @@ -34,26 +34,26 @@ end @author_options << ["#{result.name} #{email_bit}", "#{result.class.to_s}_#{result.id.to_s}"] end - + if @results.size > 0 s = select_tag( form_tag_name(object_name, :author_search_results), options_for_select(@author_options), { :id => form_tag_id(object_name, :author_search_results), :size => 3} ) s << observe_field( form_tag_id(object_name, :author_search_results), :on => 'click', :function => "alert('Element changed')", :with => 'q') else s = "No Authors found that match your search… sorry!" - end + end end def link_to_remove_fields(name, f) f.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)", :class => 'icon icon-del') end - + def link_to_add_author_fields(name, f, association, action) new_object = f.object.class.reflect_on_association(association).klass.new fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder| render(association.to_s.singularize + "_fields", :f => builder) - end + end link_to_function(name, h("add_author_fields(this, '#{association}', '#{escape_javascript(fields)}', '#{action}')"), { :class => 'icon icon-add', :id => "add_another_author" }) - end + end def sanitized_object_name(object_name) object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/,"_").sub(/_$/,"") @@ -62,64 +62,77 @@ def sanitized_method_name(method_name) method_name.sub(/\?$/, "") end - + def form_tag_name(object_name, method_name) str = "#{object_name.to_s}[#{sanitized_method_name(method_name.to_s)}]" - str.to_sym + str.to_sym end - - def form_tag_id(object_name, method_name) + + def form_tag_id(object_name, method_name) str = "#{sanitized_object_name(object_name.to_s)}_#{sanitized_method_name(method_name.to_s)}" str.to_sym end - + def form_object_id(object_name) str = object_name.split("\[").last().gsub("\]","") str.to_sym end - def render_authorships_list(publication) + def render_authorships_list(publication) s = '
'
-
+
publication.authorships.each do |authorship|
s << link_to_authorship(authorship)
s << "
#{authorship.institution}
" - end - s + s << "
" + end + + s end - + + def print_ieee_format(publication) + Rails.cache.fetch("publication-#{publication.id}-ieee") do + publication.print_entry(:ieee) + end + end + + def print_bibtex_format(publication) + Rails.cache.fetch("publication-#{publication.id}-bibtex") do + publication.print_entry(:bibtex) + end + end + + def show_bibtex_fields(bibtex_entry) s = "" bibtex_entry.attributes.keys.sort.each do |key| value = bibtex_entry.attributes[key].to_s next if key == 'id' or key == 'publication_id' or value == "" - s << "
" + l("field_#{key}") + "
" + s << "" + l("field_#{key}") + "
" s << "" if key == "entry_type" s << bibtex_entry.entry_type_label @@ -129,6 +142,6 @@ s << "
" end s - end + end end diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/app/models/author.rb --- a/vendor/plugins/redmine_bibliography/app/models/author.rb Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_bibliography/app/models/author.rb Wed Nov 21 17:56:50 2012 +0000 @@ -1,4 +1,6 @@ class Author < ActiveRecord::Base + unloadable + has_many :authorships, :dependent => :destroy has_many :publications, :through => :authorships diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/app/models/bibtex_entry_type.rb --- a/vendor/plugins/redmine_bibliography/app/models/bibtex_entry_type.rb Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_bibliography/app/models/bibtex_entry_type.rb Wed Nov 21 17:56:50 2012 +0000 @@ -1,4 +1,5 @@ class BibtexEntryType < ActiveRecord::Base + unloadable @@fields = Hash['article', ['journal', 'year', 'volume', 'number', 'pages', 'month', 'note' ], 'book' , [ 'editor', 'publisher', 'volume', 'series', 'address', 'edition', 'month', 'year', 'note' ], diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/app/models/publication.rb --- a/vendor/plugins/redmine_bibliography/app/models/publication.rb Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_bibliography/app/models/publication.rb Wed Nov 21 17:56:50 2012 +0000 @@ -2,10 +2,10 @@ class Publication < ActiveRecord::Base unloadable - + has_many :authorships, :dependent => :destroy, :order => "auth_order ASC" has_many :authors, :through => :authorships, :uniq => true - + has_one :bibtex_entry, :dependent => :destroy validates_presence_of :title @@ -14,9 +14,9 @@ accepts_nested_attributes_for :authorships accepts_nested_attributes_for :authors, :allow_destroy => true accepts_nested_attributes_for :bibtex_entry, :allow_destroy => true - + has_and_belongs_to_many :projects, :uniq => true - + before_save :set_initial_author_order # Ensure error message uses proper text instead of @@ -30,34 +30,62 @@ end end - def notify_authors_publication_added(project) + def notify_authors_publication_added(project) self.authors.each do |author| Rails.logger.debug { "Sending mail to \"#{self.title}\" publication authors." } Mailer.deliver_publication_added(author.user, self, project) unless author.user.nil? end end - - def notify_authors_publication_updated(project) + + def notify_authors_publication_updated(project) self.authors.each do |author| Rails.logger.debug { "Sending mail to \"#{self.title}\" publication authors." } Mailer.deliver_publication_updated(author.user, self, project) unless author.user.nil? end end - - + + def set_initial_author_order authorships = self.authorships - + logger.debug { "Publication \"#{self.title}\" has #{authorships.size} authors." } - + authorships.each_with_index do |authorship, index| if authorship.auth_order.nil? authorship.auth_order = index end - end + end end - - - - + + def print_bibtex_author_names + # this authors are correctly sorted because the authorships model + # already outputs the author names ASC by auth_order + self.authorships.map{|a| a.name_on_paper}.join(' and ') + end + + def print_entry(style) + bib = BibTeX::Entry.new + + bib.author = self.print_bibtex_author_names + bib.title = self.title + + self.bibtex_entry.attributes.keys.sort.each do |key| + value = self.bibtex_entry.attributes[key].to_s + next if key == 'id' or key == 'publication_id' or value == "" + + if key == "entry_type" + bib.type = BibtexEntryType.find(self.bibtex_entry.entry_type).name + else + bib[key.to_sym] = value + end + end + + if style == :ieee + CiteProc.process bib.to_citeproc, :style => :ieee, :format => :html + else + bibtex = bib.to_s :include => :meta_content + bibtex.strip! + logger.error { bibtex } + end + end end diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/app/views/projects/_bibliography_box.html.erb --- a/vendor/plugins/redmine_bibliography/app/views/projects/_bibliography_box.html.erb Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_bibliography/app/views/projects/_bibliography_box.html.erb Wed Nov 21 17:56:50 2012 +0000 @@ -1,24 +1,29 @@ +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'bibliography', :plugin => 'redmine_bibliography' %> + <%= javascript_include_tag 'bibtex', :plugin => 'redmine_bibliography' -%> +<% end %> + <% if @project.publications.any? %> <%= stylesheet_link_tag 'bibliography', :plugin => 'redmine_bibliography' %><%=l(:label_related_publication_plural)%>
--
+
- - - <%= link_to publication.title, :controller => 'publications', :action => 'show', :id => publication, :project_id => @project %> - <% if publication.bibtex_entry.year.to_s != "" %> - - (<%= publication.bibtex_entry.year %>) - - <% end %> - +
- + <%= print_ieee_format(publication) %> + +
- + <%= link_to("[More Details]", {:controller => :publications, :action => :show, :id => publication.id, :project_id => @project.id}) -%> + + <%= link_to_function "[BIBTEX]", onclick="toggleBibtex(this)" -%> + + <% end -%> -
-
<% @project.publications.each do |publication| %>
-
<%= f.text_field :title, :required => true, :size => 70 %>
-
+
-
<% if User.current.logged? %>
<%= render :partial => 'my_projects' %>
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css
--- a/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css Wed Nov 21 17:56:50 2012 +0000
@@ -22,6 +22,7 @@
ul.tags li { margin: .25em 0px; }
div.tags { text-align: center; }
+div.tags h3 { text-align: left; }
div.tags .tag-label { margin: .25em; }
div.tags .tag-nube-1 { font-size: .8em; }
div.tags .tag-nube-2 { font-size: .9em; }
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/lib/redmine_tags/patches/project_patch.rb
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/project_patch.rb Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/project_patch.rb Wed Nov 21 17:56:50 2012 +0000
@@ -13,38 +13,12 @@
unloadable
attr_accessor :tag_list
-
acts_as_taggable
end
end
- def before_save_with_save_tags()
-# debugger
- logger.error { "GONNA SAVE TAG LIST" }
-
-
-# params[:tag_list]
-
-
- # logger.error { @project.name }
-
- # if params && params[:project] && !params[:project][:tag_list].nil?
- # old_tags = context[:project].tag_list.to_s
- # context[:project].tag_list = params[:project][:tag_list]
- # new_tags = context[:project].tag_list.to_s
- #
- # unless (old_tags == new_tags || context[:project].current_journal.blank?)
- # context[:project].current_journal.details << JournalDetail.new(:property => 'attr',
- # :prop_key => 'tag_list',
- # :old_value => old_tags,
- # :value => new_tags)
- # end
- # end
- end
-
module InstanceMethods
-
end
module ClassMethods
@@ -64,7 +38,7 @@
name_like = options[:name_like]
options = {}
visible = ARCondition.new
-
+
visible << ["#{Project.table_name}.is_public = '1'"]
if name_like
@@ -73,7 +47,7 @@
options[:conditions] = visible.conditions
- self.all_tag_counts(options)
+ self.all_tag_counts(options)
end
end
end
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Wed Nov 21 17:56:50 2012 +0000
@@ -1,12 +1,13 @@
+# -*- coding: utf-8 -*-
require_dependency 'projects_controller'
module RedmineTags
module Patches
- module ProjectsControllerPatch
+ module ProjectsControllerPatch
def self.included(base)
base.send(:include, InstanceMethods)
- base.class_eval do
- unloadable
+ base.class_eval do
+ unloadable
skip_before_filter :authorize, :only => [:set_fieldset_status]
skip_before_filter :find_project, :only => [:set_fieldset_status]
before_filter :add_tags_to_project, :only => [:save, :update]
@@ -16,7 +17,7 @@
end
module InstanceMethods
-
+
def add_tags_to_project
if params && params[:project] && !params[:project][:tag_list].nil?
@@ -56,17 +57,17 @@
else
@myproj_status = session[:my_projects_fieldset_status]
end
-
+
if session[:filters_fieldset_status].nil?
@filter_status = "false"
else
@filter_status = session[:filters_fieldset_status]
end
-
+
if params && params[:project] && !params[:project][:tag_list].nil?
@filter_status = "true"
end
-
+
end
# Lists visible projects. Paginator is for top-level projects only
@@ -77,17 +78,17 @@
get_fieldset_statuses
respond_to do |format|
- format.html {
+ format.html {
paginate_projects
-
- @projects = Project.visible_roots.find(@projects, :offset => @offset, :limit => @limit, :order => sort_clause)
+
+ @projects = Project.visible_roots.find(@projects, :offset => @offset, :limit => @limit, :order => sort_clause)
if User.current.logged?
# seems sort_by gives us case-sensitive ordering, which we don't want
# @user_projects = User.current.projects.sort_by(&:name)
@user_projects = User.current.projects.all(:order => :name)
end
-
+
render :template => 'projects/index.html.erb', :layout => !request.xhr?
}
format.api {
@@ -111,8 +112,8 @@
private
- def filter_projects
- @question = (params[:q] || "").strip
+ def filter_projects
+ @question = (params[:q] || "").strip
if params.has_key?(:project)
@tag_list = (params[:project][:tag_list] || "").strip.split(",")
@@ -125,15 +126,12 @@
else
@projects = Project.visible_roots.find(Project.visible.search_by_question(@question))
end
-
+
unless @tag_list.empty?
- @tagged_projects_ids = Project.visible.tagged_with(@tag_list).collect{ |project| Project.find(project.id) }
+ @tagged_projects_ids = Project.visible.tagged_with(@tag_list).collect{ |project| Project.find(project.id).root }
@projects = @projects & @tagged_projects_ids
+ @projects = @projects.uniq
end
-
- @projects = @projects.collect{ |project| project.root }
- @projects = @projects.uniq
-
end
end
end
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb Wed Nov 21 17:56:50 2012 +0000
@@ -4,12 +4,14 @@
def self.included(base) # :nodoc:
base.send(:include, InstanceMethods)
+ base.send(:include, TagsHelper)
+
base.class_eval do
unloadable
end
end
- module InstanceMethods
+ module InstanceMethods
# Renders a tree of projects that the current user does not belong
# to, or of all projects if the current user is not logged in. The
# given collection may be a subset of the whole project tree
@@ -18,30 +20,30 @@
# description, manager(s), creation date, last activity date,
# general activity level, whether there is anything actually hosted
# here for the project, etc.
- def render_project_table_with_filtering(projects, question)
+ def render_project_table_with_filtering(projects, question)
custom_fields = ""
s = ""
if projects.any?
tokens = RedmineProjectFiltering.calculate_tokens(question, custom_fields)
-
+
s << "<%= l(:label_publication_other_details) %>
<% f.fields_for :bibtex_entry do |builder| -%>
@@ -14,12 +14,17 @@
<%= l(:text_external_url) %> +
<%= l(:text_external_url) %> +
+ <%= f.text_field :doi, :size => 70 %>
+
+ <%= l(:text_doi) %>
+
-
<% end -%>
\ No newline at end of file
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/app/views/projects/index.html.erb
--- a/vendor/plugins/redmine_tags/app/views/projects/index.html.erb Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_tags/app/views/projects/index.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -11,7 +11,6 @@
<%= l(:authors) %>
+<%= l(:authors) %>
<% f.fields_for :authorships do |builder| -%>
<%= render "authorship_fields", :f => builder %>
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/app/views/publications/show.html.erb
--- a/vendor/plugins/redmine_bibliography/app/views/publications/show.html.erb Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/show.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -1,23 +1,27 @@
-<%= stylesheet_link_tag 'bibliography', :plugin => 'redmine_bibliography' %>
-
- <% if User.current.allowed_to?(:add_publication, @project) %> + <% if User.current.allowed_to?(:add_publication, @project) %> <%= link_to l(:label_publication_edit), { :controller => "publications", :action => "edit", :id => @publication, :project_id => @project } %> | <%= link_to "Delete", {:controller => 'publications', :action => 'destroy', :id => @publication, :project_id => @project }, :confirm => l(:text_are_you_sure), :method => :delete, :title => l(:button_delete) %> | @@ -53,8 +60,8 @@
<%- end -%>
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/app/views/projects/_filter_tags.html.erb
--- a/vendor/plugins/redmine_tags/app/views/projects/_filter_tags.html.erb Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_tags.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -7,7 +7,7 @@
<%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %>
- <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}')" %>
+ <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags')}')" %>
<% end -%>
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/app/views/projects/_tagcloud.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_tagcloud.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -0,0 +1,6 @@
+
+
+
+
diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb
--- a/vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb Tue Oct 16 15:25:01 2012 +0100
+++ b/vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb Wed Nov 21 17:56:50 2012 +0000
@@ -6,6 +6,6 @@
<%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %>
- <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}', false)" %>
+ <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags')}', false)" %>
<%=l(:label_publication_show)%>
-
+
+- <%= h @publication.title %> -
+Publication Info
+<%= print_ieee_format(@publication)%>
+ +BIBTEX Format
+<%=h print_bibtex_format(@publication) %>+
<%= l(:authors) %>
+ <%- if User.current.allowed_to?(:edit_publication, @project) && @publication.authorships.length > 1 -%> <%= sortable_element("authorships", :url => { :controller => :publications, :action => :sort_author_order }, :handle => "handle") %> <%- end -%> @@ -26,18 +30,21 @@ <%= show_bibtex_fields(@publication.bibtex_entry) %> <%- end -%> +<%- unless @publication.external_url.blank? -%> ++ <%= l(:field_external_url) %>: <%= link_to h(@publication.external_url), @publication.external_url, {:target => "_blank"} -%> +
+<%- end -%> -<% unless @publication.external_url.blank? %> -- <%= l(:field_external_url) %> -
+ +<% unless @publication.doi.blank? %>- <%= link_to h(@publication.external_url), @publication.external_url, {:target => "_blank"} %> + <%= l(:field_doi)-%>: <%= link_to h(@publication.doi), "http://dx.doi.org/#{@publication.doi}", {:target => "_blank"} -%>
<% end %>- <% if User.current.allowed_to?(:add_publication, @project) %> + <% if User.current.allowed_to?(:add_publication, @project) %> <%= link_to l(:label_publication_edit), { :controller => "publications", :action => "edit", :id => @publication, :project_id => @project } %> | <%= link_to "Delete", {:controller => 'publications', :action => 'destroy', :id => @publication, :project_id => @project }, :confirm => l(:text_are_you_sure), :method => :delete, :title => l(:button_delete) %> | @@ -53,8 +60,8 @@
<%= render :partial => 'list_projects' %>
- + <%- if User.current.allowed_to?(:edit_publication, @project) -%> - <%= render :partial => 'add_project_form' %> + <%= render :partial => 'add_project_form' %> <%- end -%> <% end %> diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/assets/javascripts/bibtex.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vendor/plugins/redmine_bibliography/assets/javascripts/bibtex.js Wed Nov 21 17:56:50 2012 +0000 @@ -0,0 +1,6 @@ +function toggleBibtex(el) { + var dd = Element.up(el).next('dd') + + dd.toggleClassName('collapsed'); + Effect.toggle(dd, 'slide', {duration:0.2}); +} \ No newline at end of file diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/assets/stylesheets/bibliography.css --- a/vendor/plugins/redmine_bibliography/assets/stylesheets/bibliography.css Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_bibliography/assets/stylesheets/bibliography.css Wed Nov 21 17:56:50 2012 +0000 @@ -32,15 +32,32 @@ min-width: 150px; } -div#bibliography dl { margin-left: 2em; } -div#bibliography .box dl { margin-left: 0; } -div#bibliography dt { margin-bottom: 0px; padding-left: 20px } -div#bibliography .box dt { margin-bottom: 0px; padding-left: 10px } -div#bibliography dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; } -div#bibliography .box dd { margin-bottom: 0.6em; padding-left: 0; } + +div#bibliography dd { margin-bottom: 1em; font-size: 0.9em; } + div#bibliography dd .authors { font-style: italic; } -div#bibliography dt .title { font-style: italic; } div#bibliography dd span.authors { color: #808080; } div#bibliography dd span.year { padding-left: 0.6em; } -div#bibliography h3 { background: url(../../../images/table_multiple.png) no-repeat 0% 50%; padding-left: 20px; } +div#bibliography .box dt { + background: url(../../../images/document.png) no-repeat 0% 4px; + padding-left: 20px; + margin-left: 0; +} +div#bibliography .box dd { + padding-left: 20px; + margin-left: 0; +} + +div#bibliography h3 { + background: url(../../../images/table_multiple.png) no-repeat 0% 50%; + padding-left: 20px; +} + +div#bibliography textarea { + width: 90%; + height: 200px; + font: normal 8px; + padding: 2px 10px; + border: solid 1px #ddd; +} diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/config/locales/en.yml --- a/vendor/plugins/redmine_bibliography/config/locales/en.yml Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_bibliography/config/locales/en.yml Wed Nov 21 17:56:50 2012 +0000 @@ -12,8 +12,7 @@ label_my_publications_box: "My Publications" view_all_publications: "View All Project's Publications" publications: Publications - - + identify_author_question: Is the right person selected above? identify_author_yes: "Yes" identify_author_correct: "Yes, but I need to correct some details below" @@ -25,24 +24,25 @@ label_all_publications_for_project: Publications associated with %{project} label_authors_show: "Authorships associated with this author" label_authors_index: "List of authors" - + field_authorship_publication_title: "Publication" field_authorship_name: "Name on Paper" field_authorship_email: "Email" field_authorship_institution: "Institution" - + field_external_url: "External URL" + field_doi: "DOI" field_publication_title: Title field_publication_authors: Authors field_publication_projects: "Associated projects" field_author_name: Author field_author_user: User Name field_author_username: "Associated user" - field_author_publications: "Publications by this Author" + field_author_publications: "Publications by this Author" field_identify_author_yes: "Yes" field_identify_author_correct: "Corrections" field_identify_author_no: "No" - + label_author_is_me: "(I am this author)" label_add_me_as_author: "Add me as an author" label_add_an_author: "Add an author" @@ -54,7 +54,7 @@ label_author_information: "Author Information" remove_author: "Remove this author" - + label_publication_plural: "Publications" label_related_publication_plural: "Related publications" label_publication_new: "Create New Publication" @@ -67,22 +67,23 @@ label_publication_project_index: "Projects associated with this publication" label_publication_index: "View all publications" label_publication_other_details: "Details" - + text_external_url: "Link to the publication or to an external page about it." + text_doi: "DOI (Digital Object Identifier)." text_author_name_on_paper: "Author's name as it appears on the paper." text_author_institution: "Author's institution as on the paper." text_author_email: "Author's email address as on the paper." - + text_author_search: "Search existing authors" - + # authorships model field_institution: "Institution" - field_name_on_paper: "Name" + field_name_on_paper: "Name" field_email: "Email Address" - + # bibtex_entries model field_entry_type: "Publication Type" - field_id: "id" + field_id: "id" field_publication_id: "Publication_id" field_address: "Address" field_annote: "Annote" @@ -122,7 +123,7 @@ field_bibtex_proceedings: Conference proceedings field_bibtex_techreport: Technical report field_bibtex_unpublished: Unpublished - + label_author_1: First author label_author_2: Second author label_author_3: Third author @@ -146,6 +147,6 @@ mail_subject_publication_added: "You have been added as an author to a new publication" mail_body_publication_added: "A new publication (%{publication}) has been added to the project '%{project}.'" - - - + + + diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/db/migrate/008_add_doi_and_timestamp_columns_to_publications.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vendor/plugins/redmine_bibliography/db/migrate/008_add_doi_and_timestamp_columns_to_publications.rb Wed Nov 21 17:56:50 2012 +0000 @@ -0,0 +1,12 @@ +class AddDoiAndTimestampColumnsToPublications < ActiveRecord::Migration + def self.up + add_column :publications, :doi, :string + add_timestamps :publications + + end + + def self.down + remove_column :publications, :doi + remove_timestamps :publications + end +end diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/db/migrate/009_add_timestamp_columns_to_authors.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vendor/plugins/redmine_bibliography/db/migrate/009_add_timestamp_columns_to_authors.rb Wed Nov 21 17:56:50 2012 +0000 @@ -0,0 +1,9 @@ +class AddTimestampColumnsToAuthors < ActiveRecord::Migration + def self.up + add_timestamps :authors + end + + def self.down + remove_timestamps :authors + end +end diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/init.rb --- a/vendor/plugins/redmine_bibliography/init.rb Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_bibliography/init.rb Wed Nov 21 17:56:50 2012 +0000 @@ -1,7 +1,8 @@ require 'redmine' require 'dispatcher' -RAILS_DEFAULT_LOGGER.info 'Starting Bibliography Plugin for RedMine' +require 'bibtex' +require 'citeproc' # Patches to the Redmine core. Dispatcher.to_prepare :redmine_model_dependencies do @@ -21,7 +22,9 @@ Mailer.send(:include, Bibliography::MailerPatch) end - + unless ProjectsHelper.included_modules.include?(Bibliography::ProjectsHelperPatch) + ProjectsHelper.send(:include, Bibliography::ProjectsHelperPatch) + end end @@ -47,5 +50,5 @@ # extending the Project Menu menu :project_menu, :publications, { :controller => 'publications', :action => 'index', :path => nil }, :after => :activity, :param => :project_id, :caption => Proc.new { Setting.plugin_redmine_bibliography['menu'] }, :if => Proc.new { !Setting.plugin_redmine_bibliography['menu'].blank? } - + end diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/lib/bibliography/projects_helper_patch.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vendor/plugins/redmine_bibliography/lib/bibliography/projects_helper_patch.rb Wed Nov 21 17:56:50 2012 +0000 @@ -0,0 +1,17 @@ +module Bibliography + module ProjectsHelperPatch + + def self.included(base) # :nodoc: + base.send(:include, InstanceMethods) + base.send(:include, PublicationsHelper) + + base.class_eval do + unloadable + end + end + + module InstanceMethods + end + end +end + diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb --- a/vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb Wed Nov 21 17:56:50 2012 +0000 @@ -1,16 +1,16 @@ require_dependency 'user' module Bibliography - module UserAuthorPatch + module UserAuthorPatch def self.included(base) - base.send(:include, InstanceMethods) - extend ClassMethods - + base.send(:include, InstanceMethods) + extend ClassMethods + end #self.included - + module ClassMethods - end - + end + module InstanceMethods def institution @@ -18,28 +18,28 @@ institution_name = self.ssamr_user_detail.institution_name else institution_name = "No Institution Set" - end - return institution_name + end + return institution_name end def get_author_info # TODO: DELETE THIS METHOD?? - info = { + info = { :name_on_paper => self.name, :email => self.mail, :institution => "", :author_user_id => self.id, - :is_user => "1" + :is_user => "1" } if not self.ssamr_user_detail.nil? info[:institution] = self.ssamr_user_detail.institution_name end - return info + return info end - + end #InstanceMethods - + end #UserPublicationsPatch end #RedmineBibliography diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/app/helpers/tags_helper.rb --- a/vendor/plugins/redmine_tags/app/helpers/tags_helper.rb Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_tags/app/helpers/tags_helper.rb Wed Nov 21 17:56:50 2012 +0000 @@ -40,8 +40,11 @@ content_tag('span', content, :class => 'tag-label') end - def render_project_tag_link(tag) + def render_project_tag_link(tag, options = {}) content = link_to tag.name, :controller => :projects, :action => :index, :project => { :tag_list => tag.name } + if options[:show_count] + content << content_tag('span', "(#{tag.count})", :class => 'tag-count') + end content_tag('span', content, :class => 'tag-label') end @@ -73,7 +76,7 @@ end tag_cloud tags, (1..8).to_a do |tag, weight| - content << " " + content_tag(item_el, render_tag_link(tag, options), :class => "tag-nube-#{weight}") + " " + content << " " + content_tag(item_el, render_project_tag_link(tag, options), :class => "tag-nube-#{weight}") + " " end content_tag(list_el, content, :class => 'tags') diff -r 97a00e2e145d -r b9e34a051f82 vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb --- a/vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb Tue Oct 16 15:25:01 2012 +0100 +++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb Wed Nov 21 17:56:50 2012 +0000 @@ -6,7 +6,7 @@ <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' -%> - <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_search_tags', :project_id => Project.first.id)}', true)" -%> + <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_search_tags')}', true)" -%>"
s << ""
s << "
"
else
s << "\n"
@@ -51,7 +53,7 @@
s
end
- def render_project_in_table_with_filtering(project, oddeven, level, tokens)
+ def render_project_in_table_with_filtering(project, oddeven, level, tokens)
# set the project environment to please macros.
@project = project
@@ -71,7 +73,7 @@
s << "" << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') << " "
s << ""
-
+
u = project.users_by_role
if u
u.keys.each do |r|
@@ -90,7 +92,7 @@
end
s << " "
-
+
s << "" << format_date(project.created_on) << " "
s << "" << format_date(project.updated_on) << " "
@@ -104,9 +106,9 @@
s
end
-
-
-
+
+
+
# Renders a tree of projects as a nested set of unordered lists
# The given collection may be a subset of the whole project tree
# (eg. some intermediate nodes are private and can not be seen)
@@ -115,7 +117,7 @@
if projects.any?
tokens = RedmineProjectFiltering.calculate_tokens(question, custom_fields)
debugger
-
+
ancestors = []
original_project = @project
@@ -127,14 +129,14 @@
else
ancestors.pop
s << ""
- while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
+ while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
ancestors.pop
s << ""
end
end
classes = (ancestors.empty? ? 'root' : 'child')
s << "
| " << l("tags") << " | " s << "" << l("label_managers") << " | " s << sort_header_tag('created_on', :default_order => 'desc') s << sort_header_tag('updated_on', :default_order => 'desc') - + s << "
|---|
" +
- link_to( highlight_tokens(project.name, tokens),
+ link_to( highlight_tokens(project.name, tokens),
{:controller => 'projects', :action => 'show', :id => project},
:class => "project #{User.current.member_of?(project) ? 'my-project' : nil}"
)
@@ -145,7 +147,7 @@
# value = value_model.present? ? value_model.value : nil
# s << "#{field.name.humanize}: #{highlight_tokens(value, tokens)} " if value.present?
# end
-
+
s << ""
s << ""
unless project.description.blank?
@@ -162,7 +164,7 @@
end
s.join "\n"
end
-
+
# Renders a tree of projects where the current user belongs
# as a nested set of unordered lists
# The given collection may be a subset of the whole project tree
@@ -192,9 +194,9 @@
s
end
-
-
-
+
+
+
def render_my_project_in_hierarchy_with_tags(project)
@@ -214,7 +216,7 @@
else
s << " " << l(:field_is_private) << ""
end
-
+
tc = project.tag_counts
if tc.empty?
s << " "
@@ -241,15 +243,15 @@
end
-
-
+
+
private
-
+
# copied from search_helper. This one doesn't escape html or limit the text length
def highlight_tokens(text, tokens)
return text unless text && tokens && !tokens.empty?
re_tokens = tokens.collect {|t| Regexp.escape(t)}
- regexp = Regexp.new "(#{re_tokens.join('|')})", Regexp::IGNORECASE
+ regexp = Regexp.new "(#{re_tokens.join('|')})", Regexp::IGNORECASE
result = ''
text.split(regexp).each_with_index do |words, i|
words = words.mb_chars
@@ -262,7 +264,7 @@
end
result
end
-
+
end
end
end