From d941e096bae31c2520aec6214ca3e3c248db191c Mon Sep 17 00:00:00 2001
From: Saurabh Bhatia <saurabh.a.bhatia@gmail.com>
Date: Wed, 25 Jun 2014 21:43:04 +0800
Subject: [PATCH] added brief intro

---
 app/assets/javascripts/admin/journal_paper_intros.js  |  2 ++
 app/assets/stylesheets/admin/journal_paper_intros.css |  4 ++++
 .../admin/journal_paper_intros_controller.rb          |  8 ++++++++
 app/helpers/admin/journal_paper_intros_helper.rb      |  2 ++
 app/models/journal_paper_intro.rb                     |  3 +++
 app/views/admin/journal_papers/index.html.erb         |  2 +-
 app/views/plugin/journal_paper/_profile.html.erb      |  5 ++++-
 config/locales/en.yml                                 |  2 +-
 config/locales/zh_tw.yml                              |  2 +-
 config/routes.rb                                      |  1 +
 lib/personal_journal/engine.rb                        |  4 ++--
 .../admin/journal_paper_intros_controller_test.rb     |  7 +++++++
 test/fixtures/journal_paper_intros.yml                | 11 +++++++++++
 .../helpers/admin/journal_paper_intros_helper_test.rb |  4 ++++
 test/models/journal_paper_intro_test.rb               |  7 +++++++
 15 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/javascripts/admin/journal_paper_intros.js
 create mode 100644 app/assets/stylesheets/admin/journal_paper_intros.css
 create mode 100644 app/controllers/admin/journal_paper_intros_controller.rb
 create mode 100644 app/helpers/admin/journal_paper_intros_helper.rb
 create mode 100644 app/models/journal_paper_intro.rb
 create mode 100644 test/controllers/admin/journal_paper_intros_controller_test.rb
 create mode 100644 test/fixtures/journal_paper_intros.yml
 create mode 100644 test/helpers/admin/journal_paper_intros_helper_test.rb
 create mode 100644 test/models/journal_paper_intro_test.rb

diff --git a/app/assets/javascripts/admin/journal_paper_intros.js b/app/assets/javascripts/admin/journal_paper_intros.js
new file mode 100644
index 0000000..dee720f
--- /dev/null
+++ b/app/assets/javascripts/admin/journal_paper_intros.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/stylesheets/admin/journal_paper_intros.css b/app/assets/stylesheets/admin/journal_paper_intros.css
new file mode 100644
index 0000000..afad32d
--- /dev/null
+++ b/app/assets/stylesheets/admin/journal_paper_intros.css
@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/
diff --git a/app/controllers/admin/journal_paper_intros_controller.rb b/app/controllers/admin/journal_paper_intros_controller.rb
new file mode 100644
index 0000000..f2efd52
--- /dev/null
+++ b/app/controllers/admin/journal_paper_intros_controller.rb
@@ -0,0 +1,8 @@
+class Admin::JournalPaperIntrosController < Admin::PersonalPluginIntrosController
+  def initialize
+    super
+    @app_type = 'journal_paper_intro'
+    @app_type_name = 'journal_paper'
+    @reback_name = 'JournalPaper'
+  end
+end
diff --git a/app/helpers/admin/journal_paper_intros_helper.rb b/app/helpers/admin/journal_paper_intros_helper.rb
new file mode 100644
index 0000000..3dc03bf
--- /dev/null
+++ b/app/helpers/admin/journal_paper_intros_helper.rb
@@ -0,0 +1,2 @@
+module Admin::JournalPaperIntrosHelper
+end
diff --git a/app/models/journal_paper_intro.rb b/app/models/journal_paper_intro.rb
new file mode 100644
index 0000000..570724e
--- /dev/null
+++ b/app/models/journal_paper_intro.rb
@@ -0,0 +1,3 @@
+class JournalPaperIntro < PersonalPluginIntro
+	
+end
diff --git a/app/views/admin/journal_papers/index.html.erb b/app/views/admin/journal_papers/index.html.erb
index aab137b..5e43349 100644
--- a/app/views/admin/journal_papers/index.html.erb
+++ b/app/views/admin/journal_papers/index.html.erb
@@ -12,7 +12,7 @@
 	<thead>
 		<tr>
 			<th class="span1"><%= t('personal_journal.year') %></th>
-			<th class="span7"><%= t('module_name.personal_journal') %></th>
+			<th class="span7"><%= t('module_name.journal_paper') %></th>
 			<th class="span1"><%= t('personal_journal.authors') %></th>
 		</tr>
 	</thead>
diff --git a/app/views/plugin/journal_paper/_profile.html.erb b/app/views/plugin/journal_paper/_profile.html.erb
index c5a492e..0ccd75e 100644
--- a/app/views/plugin/journal_paper/_profile.html.erb
+++ b/app/views/plugin/journal_paper/_profile.html.erb
@@ -47,7 +47,7 @@
       <th><input type="checkbox" /></th>
       <% end -%>
       <th class="span1"><%= t('personal_journal.year') %></th>
-      <th><%= t('module_name.personal_journal') %></th>
+      <th><%= t('module_name.journal_paper') %></th>
       <% if not @user%>
         <th><%= t('personal_journal.authors') %></th>
       <% end %>
@@ -85,7 +85,10 @@
 
 <% if current_user.is_admin? %>
 <div class="bottomnav clearfix">
+
   <div class="action pull-right">
+    <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'),admin_journal_paper_intros_path(member_profile_id: @member.id), :class => 'btn btn-primary' %>
+
     <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_admin_journal_paper_path(member_profile_id: @member.id), :class => 'btn btn-primary' %>
   </div>
   <div class="pagination pagination-centered">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index acf8ed5..d5fd8f1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,6 @@
 en:
   module_name:
-    personal_journal: Journal Paper
+    journal_paper: Journal Paper
   personal_journal:
     paper_title : "Paper Title"
     journal_title : "Journal Title"
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index ecf4683..fca768a 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -1,6 +1,6 @@
 zh_tw:
   module_name:
-    personal_journal: 期刊論文
+    journal_paper: 期刊論文
   personal_journal:
     paper_title : "論文名稱"
     journal_title : "期刊名稱"
diff --git a/config/routes.rb b/config/routes.rb
index b7ff852..9831d7d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -19,6 +19,7 @@ Rails.application.routes.draw do
 			resources :journal_levels
 			resources :journal_paper_author_types
 			resources :journal_paper_types
+			resources :journal_paper_intros
 		end
 	end
 end
diff --git a/lib/personal_journal/engine.rb b/lib/personal_journal/engine.rb
index f1947b8..18f8e67 100644
--- a/lib/personal_journal/engine.rb
+++ b/lib/personal_journal/engine.rb
@@ -2,9 +2,9 @@ module PersonalJournal
   class Engine < ::Rails::Engine
   	initializer "personal_journal" do
 		OrbitApp.registration "PersonalJournal",:type=> 'ModuleApp' do
-			module_label 'module_name.personal_journal'
+			module_label 'module_name.journal_paper'
 			base_url File.expand_path File.dirname(__FILE__)
-			personal_plugin :enable => true, :sort_number => '5', :app_name=>"JournalPaper", :intro_app_name=>"PersonalJournalIntro",:path=>"/plugin/journal_paper/profile",:front_path=>"/profile",:admin_path=>"/admin/journal_papers/",:i18n=>'module_name.personal_journal'
+			personal_plugin :enable => true, :sort_number => '5', :app_name=>"JournalPaper", :intro_app_name=>"JournalPaperlIntro",:path=>"/plugin/journal_paper/profile",:front_path=>"/profile",:admin_path=>"/admin/journal_papers/",:i18n=>'module_name.journal_paper'
 
 			version "0.1"
 			organization "Rulingcom"
diff --git a/test/controllers/admin/journal_paper_intros_controller_test.rb b/test/controllers/admin/journal_paper_intros_controller_test.rb
new file mode 100644
index 0000000..c719b55
--- /dev/null
+++ b/test/controllers/admin/journal_paper_intros_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Admin::JournalPaperIntrosControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/fixtures/journal_paper_intros.yml b/test/fixtures/journal_paper_intros.yml
new file mode 100644
index 0000000..937a0c0
--- /dev/null
+++ b/test/fixtures/journal_paper_intros.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value
diff --git a/test/helpers/admin/journal_paper_intros_helper_test.rb b/test/helpers/admin/journal_paper_intros_helper_test.rb
new file mode 100644
index 0000000..1eea9a3
--- /dev/null
+++ b/test/helpers/admin/journal_paper_intros_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class Admin::JournalPaperIntrosHelperTest < ActionView::TestCase
+end
diff --git a/test/models/journal_paper_intro_test.rb b/test/models/journal_paper_intro_test.rb
new file mode 100644
index 0000000..a62f4a9
--- /dev/null
+++ b/test/models/journal_paper_intro_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class JournalPaperIntroTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end