fixed journal type page
This commit is contained in:
		
							parent
							
								
									bf31d0c3dd
								
							
						
					
					
						commit
						a183ac6041
					
				|  | @ -14,6 +14,5 @@ | |||
| //= require orbitdesktopAPI
 | ||||
| //= require orbitTimeline
 | ||||
| //= require orbitdesktop
 | ||||
| //= require desktop/journal_pages
 | ||||
| //= require desktop/seminar_pages
 | ||||
| //= require desktop/books_pages
 | ||||
|  | @ -0,0 +1,8 @@ | |||
| // This is a manifest file that'll be compiled into including all the files listed below.
 | ||||
| // Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
 | ||||
| // be included in the compiled file accessible from http://example.com/assets/application.js
 | ||||
| // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 | ||||
| // the compiled file.
 | ||||
| //
 | ||||
| //= require desktop/journal_pages
 | ||||
| 
 | ||||
|  | @ -15,7 +15,7 @@ | |||
|           <ul id='setting_left_nav'> | ||||
|             <li><a href="<%= panel_personal_journal_desktop_journal_pages_path %>" callback-method="list" load="true" class="hh2 w2 hp thmc1 thmtxt xx" onclick='return false;'>List</a></li> | ||||
|             <li><a href="<%= new_panel_personal_journal_desktop_journal_page_path %>" callback-method="addpaper" custom-load="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li> | ||||
|             <li><a href="" callback-method="journal" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li> | ||||
|             <li><a href="<%= panel_personal_journal_desktop_journal_type_path %>" callback-method="journal" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li> | ||||
|             <li><a href="<%= panel_personal_journal_desktop_co_authors_path %>" class="admtxt hh2 w2 hp" callback-method="coauthor" custom-load="coauthor" onclick='return false;'>Co-Authors</a></li> | ||||
|             <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li> | ||||
|             <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li> | ||||
|  |  | |||
|  | @ -4,8 +4,8 @@ Rails.application.routes.draw do | |||
|       namespace :desktop do | ||||
|         match 'journal_p'=>'journal_p#journal_p' | ||||
|         match 'get_journals_json' => 'journal_pages#get_journals_json' | ||||
|         match 'journal_type' => 'journal_pages#journal_type' | ||||
|         resources :journal_pages, except: :show | ||||
|         resources :journal_lists, only: :index | ||||
|         resources :co_authors, except: :show | ||||
|         resources :co_author_relations, except: :show | ||||
|       end | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue