developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'publication' into journal_list

Browse Source 
* publication: (23 commits)
  adjust update password textfield position
  correct user passwd and sent json to front-end
  correct user passwd and sent json to front-end
  if coauthor not in coauthor db then it will be add in db
  fixed journal update method
  jumping menus updated..
  remove edit page cancel buttom
  delete fixed..
  multiple file fixed
  have done multiple file
  can add multiple file
  Module store
  Joshua's html
  Change icons
  add quick link to change user password, but it's not work
  change template
  add templete
  add templete
  url fixed and edit form fixed for tinyscrollbar
  easy to make fake data
  ...
This commit is contained in:
Rueshyna committed 2012-11-30 21:02:18 +08:00
2 parents 2f05885c4a 192779fb6e
commit ccacef6d9e
107 files changed
+3638 -1066
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/helpers/application_helper.rb
+1
View File
@@ -183,6 +183,7 @@ module ApplicationHelper
unless edit
stylesheets << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css' />\n"
stylesheets << "<link href='/assets/style.css' rel='stylesheet' type='text/css' />\n"
stylesheets << "<link href='/assets/icons.css' rel='stylesheet' type='text/css' />\n"
end
stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset
stylesheets << "<link href='/assets/bootstrap.css' rel='stylesheet' type='text/css' />\n"