Merge branch 'master' of github.com:Rulingcom/NCCU

Conflicts:
	config/locales/zh_tw.yml

app/assets/javascripts/tinymce_orbit.js.erb

@@ -14,11 +14,11 @@ function load_tinymce() {
     theme_advanced_toolbar_align : "left",
     theme_advanced_statusbar_location : "bottom",
     theme_advanced_resizing : true,
-
+  relative_urls : false,
     // Skin options
     skin : "o2k7",
     skin_variant : "silver",
-
+    font_size_style_values : "xx-small,x-small,small,medium,large,x-large,xx-large",
     // Drop lists for link/image/media/template dialogs
     template_external_list_url : "js/template_list.js",
     // external_link_list_url : "js/link_list.js",

app/views/admin/assets/file_upload.html.erb

@@ -55,7 +55,7 @@
     <div style="position: absolute; width: 100%; bottom: 0;">
         <div class="modal-footer">
             <!-- <a id='ajax_form_submit' class="btn btn-primary"><#%= t(:create) %></a> -->
-             <input type="submit" value="<%= t(:create) %>" class="btn btn-primary" />
+             <input type="submit" value="<%= t(:create_) %>" class="btn btn-primary" />
         </div>
     </div>
 

app/views/admin/object_auths_new_interface/_modal_list.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in" id="ob_auth-<%=ob_auth.id%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("object_auth.list_title_of_users",:auth_title => ob_auth.title) %></h3>
+    <h3><%= t("object_auth.list_title_of_users") %></h3>
   </div>
   <div class="modal-body">
 		<div class="clear">

app/views/admin/object_auths_new_interface/setting.html.erb

@@ -19,7 +19,7 @@
 
         </li>
     </ul>
-		<%= link_to t("object_auth.list_title_of_users", :auth_title => @ob_auth.title), admin_object_auth_ob_auth_show_path(:app_key=>@module_app.key), :class=>'preview_trigger btn btn-success pull-right'%>	
+		<%= link_to t("object_auth.list_title_of_users"), admin_object_auth_ob_auth_show_path(:app_key=>@module_app.key), :class=>'preview_trigger btn btn-success pull-right'%>	
 
 </div>
 <%#= label_tag :role, t(:roles) %>