483 sorting

.gitignore

@@ -11,6 +11,7 @@
 /log/*
 !/log/.keep
 /tmp
+db/dumps
 *~
 public/uploads
 .*sw?

app/controllers/authorships_controller.rb

@@ -23,12 +23,12 @@ def create
       email = @authorship.person.email
       if User.find_by_email(email).nil?
         User.create(email: email, password: password, password_confirmation: password)
-        UserMailer.add(email, password).deliver_now
-      end     
+        #UserMailer.add(email, password).deliver_now
+      end
       redirect_to submission
-	else
-	  render :new
-	end
+    else
+      render :new
+    end
   end
 
   def destroy
@@ -48,7 +48,7 @@ def authorship_params
     params.require(:authorship).permit(:person_id,:corresponding,:position)
   end
 
-  def create_password(len=8) 
+  def create_password(len=8)
     SecureRandom.hex(len)
   end
 end

app/controllers/public_reviews_controller.rb

@@ -24,15 +24,15 @@ def accepted
       render :accepted_form
     else
       @review.accept!(params[:review][:deadline])
-      ReviewMailer.send_status(@review).deliver_now
+      ReviewMailer.send_status(@review).deliver_later
     end
   end
 
   def rejected
     @review = Review.find(params[:id])
     if @review.email == params[:review][:email]
       @review.reject!
-      ReviewMailer.send_status(@review).deliver_now
+      ReviewMailer.send_status(@review).deliver_later
     else
       @review.errors.add(:email,"E-mail jest niepoprawny")
       flash[:error] = "Adres e-mail jest niepoprawny"

app/controllers/reviews_controller.rb

@@ -73,8 +73,8 @@ def destroy
 
   def ask
     review = Review.find(params[:id])
-    ReviewMailer.ask(review).deliver_now
-    redirect_to review.submission, flash: {notice: "Zapytanie zostało wysłane"}
+    #ReviewMailer.ask(review).deliver_now
+    redirect_to review.submission, flash: {error: "Zapytanie NIE zostało wysłane"}
   end
 
   def accepted

app/controllers/submissions_controller.rb

@@ -71,12 +71,12 @@ def check_status(old_status,new_status)
     if old_status != new_status
       if new_status == 'odrzucony' || new_status == 'do poprawy' || new_status == 'przyjęty'
         submission = Submission.find(params[:id])
-        AuthorMailer.send_decision(submission).deliver_later
+        #AuthorMailer.send_decision(submission).deliver_later
       end
       if new_status == 'przyjęty'
         authors = Submission.find(params[:id]).authors
         authors.each do |author|
-          AuthorMailer.send_contract(submission,author).deliver_later
+          #AuthorMailer.send_contract(submission,author).deliver_later
         end
       end
     end

app/helpers/application_helper.rb

@@ -16,7 +16,10 @@ def icon_to(klass,path,options={})
   end
 
   def active?(url)
-    if URI.parse(request_uri).path == URI.parse(url).path
+    return "" if url.nil?
+    logger.info([url, request_uri])
+    logger.info([path_id(url), path_id(request_uri)])
+    if path_id(request_uri) == path_id(url)
       "active"
     else
       ""
@@ -35,4 +38,9 @@ def reset_filters(f)
   def set_title(title = "")
     @site_title = !title.empty? ? title + " - " + "Rocznik Kognitywistyczny" : "Rocznik Kognitywistyczny"
   end
+
+  private
+  def path_id(url)
+    URI.parse(url).path.gsub(%r{^/+},"").gsub(%r{/+$},"")
+  end
 end

app/views/public_issues/show.html.haml

@@ -10,4 +10,5 @@
       %li
         = article.authors_inline + "."
         %i= link_to article.title, public_article_path(article)
+        = "s. #{article.article_pages}"
 

app/views/shared/sidenav.html.haml

@@ -1,16 +1,20 @@
 %ul.nav.navbar-sidebar.nav-pills.nav-stacked
   %li{:class => active?("")}
     = link_to "Strona główna", "/"
+  %li{:class => active?("cfp-kognitywistyka-krytyki-i-kontrowersje")}
+    = link_to "Temat specjalny", "/cfp-kognitywistyka-krytyki-i-kontrowersje"
   %li{:class => active?("redakcja")}
     = link_to "Redakcja", "/redakcja"
   %li{:class => active?("procedura-recenzyjna")}
     = link_to "Procedura recenzyjna", "/procedura-recenzyjna"
-  %li= link_to "Zgłoś artykuł", new_public_submission_path
+  %li{:class => active?("wytyczne-dla-autorow")}
+    = link_to "Wytyczne dla autorów", "/wytyczne-dla-autorow"
+  %li{:class => [active?("public_submissions/new"), "call-to-action"]}= link_to "Zgłoś artykuł", new_public_submission_path
   - if user?
-    %li= link_to "Twój profil", profile_path
-    %li= link_to "Twoje artykuły", user_submissions_path
+    %li{:class => active?("profile")}= link_to "Twój profil", profile_path
+    %li{:class => active?("user_submissions")}= link_to "Twoje artykuły", user_submissions_path
   %li{:class => active?(public_issues_path)}= link_to "Numery", public_issues_path
-  - Issue.published.each do |issue|
+  - Issue.published.sort_by{|i| - i.volume }.each do |issue|
     %li{:class => active?(public_issue_path(issue))}= link_to issue.title, public_issue_path(issue)
 .sm-buttons.icon-bar.vertical
   .fb-like{"data-action" => "like", "data-href" => "https://www.facebook.com/Rocznik-Kognitywistyczny-213997978935029/", "data-layout" => "button", "data-share" => "true", "data-show-faces" => "true", "data-width" => "300"}