Conflicts: Gemfile app/controllers/courses_controller.rb app/views/attachments/_form.html.erb app/views/attachments/_form_course.html.erb app/views/files/_attachement_list.html.erb app/views/layouts/base.html.erb app/views/layouts/base_projects.html.erb config/locales/zh.yml public/javascripts/attachments.jssw_new_course
commit
b9031095d4
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,42 @@
|
|||||||
|
class DiscussDemosController < ApplicationController
|
||||||
|
def index
|
||||||
|
|
||||||
|
@discuss_demo_list = DiscussDemo.where("body is not null").order("created_at desc").page(params[:page] || 1).per(10)
|
||||||
|
end
|
||||||
|
|
||||||
|
def new
|
||||||
|
@discuss_demo = DiscussDemo.create
|
||||||
|
@discuss_demo.save!
|
||||||
|
@discuss_demo
|
||||||
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
def update
|
||||||
|
@discuss_demo = DiscussDemo.find(params[:id])
|
||||||
|
@discuss_demo.update_attributes(:title => params[:discuss_demo][:title],:body => params[:discuss_demo][:body])
|
||||||
|
redirect_to :controller=> 'discuss_demos',:action => 'show',:id => params[:id]
|
||||||
|
end
|
||||||
|
|
||||||
|
def delete
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
def destroy
|
||||||
|
asset = Kindeditor::Asset.find_by_owner_id(params[:id])
|
||||||
|
if !asset.nil?
|
||||||
|
filepath = File.join(Rails.root,"public","files","uploads",
|
||||||
|
asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s,
|
||||||
|
asset[:asset].to_s)
|
||||||
|
File.delete(filepath) if File.exist?filepath
|
||||||
|
end
|
||||||
|
DiscussDemo.destroy(params[:id])
|
||||||
|
redirect_to :controller=> 'discuss_demos',:action => 'index'
|
||||||
|
end
|
||||||
|
|
||||||
|
def show
|
||||||
|
@discuss_demo = DiscussDemo.find(params[:id])
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
class GitCallbackController < ApplicationController
|
||||||
|
|
||||||
|
def post_update
|
||||||
|
@repository = Repository.find_by_root_url(params[:root_url])
|
||||||
|
@repository.fetch_changesets
|
||||||
|
render :text => 'success'
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
module DiscussDemosHelper
|
||||||
|
end
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
class DiscussDemo < ActiveRecord::Base
|
||||||
|
attr_accessible :title, :body
|
||||||
|
has_many_kindeditor_assets :assets, :dependent => :destroy
|
||||||
|
end
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
class Kindeditor::Asset < ActiveRecord::Base
|
||||||
|
self.table_name = 'kindeditor_assets'
|
||||||
|
mount_uploader :asset, Kindeditor::AssetUploader
|
||||||
|
validates_presence_of :asset
|
||||||
|
before_save :update_asset_attributes
|
||||||
|
attr_accessible :asset
|
||||||
|
|
||||||
|
private
|
||||||
|
def update_asset_attributes
|
||||||
|
if asset.present? && asset_changed?
|
||||||
|
self.file_size = asset.file.size
|
||||||
|
self.file_type = asset.file.content_type
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
class Kindeditor::File < Kindeditor::Asset
|
||||||
|
mount_uploader :asset, Kindeditor::FileUploader
|
||||||
|
end
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
class Kindeditor::Flash < Kindeditor::Asset
|
||||||
|
mount_uploader :asset, Kindeditor::FlashUploader
|
||||||
|
end
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
class Kindeditor::Image < Kindeditor::Asset
|
||||||
|
mount_uploader :asset, Kindeditor::ImageUploader
|
||||||
|
end
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
class Kindeditor::Media < Kindeditor::Asset
|
||||||
|
mount_uploader :asset, Kindeditor::MediaUploader
|
||||||
|
end
|
||||||
@ -1,7 +1,7 @@
|
|||||||
$('#attachments_<%= j params[:attachment_id] %>').remove();
|
$('#attachments_<%= j params[:attachment_id] %>').remove();
|
||||||
var count=$('#attachments_fields>span').length;
|
var count=$('#attachments_fields>span').length;
|
||||||
if(count<=0){
|
if(count<=0){
|
||||||
$("#upload_file_count").text("未上传文件");
|
$("#upload_file_count").text(<%= l(:label_no_file_uploaded)%>);
|
||||||
$(".remove_all").remove();
|
$(".remove_all").remove();
|
||||||
}else{
|
}else{
|
||||||
$("#upload_file_count").html("已上传"+"<span id=\"count\">"+count+"</span>"+"个文件");
|
$("#upload_file_count").html("已上传"+"<span id=\"count\">"+count+"</span>"+"个文件");
|
||||||
|
|||||||
@ -0,0 +1,25 @@
|
|||||||
|
<h1 style="">文章列表</h1>
|
||||||
|
<div>
|
||||||
|
<table border="1px solid !important" >
|
||||||
|
<% @discuss_demo_list.each do |e| %>
|
||||||
|
|
||||||
|
<tr align="left" height="20">
|
||||||
|
<td width="30%" ><%= truncate(e.title,:length => 50) %></td>
|
||||||
|
<td align="center" width="60%">
|
||||||
|
<%= truncate(e.body,:length => 50) %>
|
||||||
|
</td>
|
||||||
|
<td style=" margin-right: 1" width="10%">
|
||||||
|
<%= link_to '查看文章',{:controller => 'discuss_demos',:action => 'show',:id=>e.id} %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
<%= link_to '删除文章',discuss_demo_path(e.id), :method => :delete,:confirm => l(:text_are_you_sure) %>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr height="20"></tr>
|
||||||
|
<tr height="20"></tr>
|
||||||
|
<% end %>
|
||||||
|
</table>
|
||||||
|
<% paginate @discuss_demo_list %>
|
||||||
|
<%= link_to '新建文章',new_discuss_demo_path %>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
<%= javascript_include_tag src='/assets/kindeditor/kindeditor' %>
|
||||||
|
<h1>新建文章</h1>
|
||||||
|
<%= form_for @discuss_demo,:url => {:controller => 'discuss_demos',:action => "show",:id =>@discuss_demo.id, :method => :put} do |f| %>
|
||||||
|
<%= f.text_field :title %>
|
||||||
|
<%= f.kindeditor :body ,:owner_id => @discuss_demo.id%>
|
||||||
|
<%= f.submit :value=> '提交' %>
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
<h1><%= @discuss_demo.title %></h1>
|
||||||
|
<%= textAreailizable @discuss_demo.body %>
|
||||||
|
<%=link_to "返回首页",discuss_demos_path %>
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
<!-- added by fq -->
|
||||||
|
<!-- %= form_for(@forum) do |f| % -->
|
||||||
|
|
||||||
|
<div id="share_new" style = "width: 500px; margin:0 auto; " >
|
||||||
|
<%= labelled_form_for(@forum) do |f| %>
|
||||||
|
<% if @forum.errors.any? %>
|
||||||
|
<!--<div id="error_explanation">
|
||||||
|
<h2><#%= pluralize(@forum.errors.count, "error") %> prohibited this forum from being saved:</h2>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<#% @forum.errors.full_messages.each do |msg| %>
|
||||||
|
<li><#%= msg %></li>
|
||||||
|
<#% end %>
|
||||||
|
</ul>
|
||||||
|
</div> -->
|
||||||
|
<% end %>
|
||||||
|
<div style="width: 120%;">
|
||||||
|
<div class="field">
|
||||||
|
<%= f.text_field :name, :required => true, :style => 'width: 100%;', :class => 'create-share', :maxlength => 50%>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<% if User.current.logged? && User.current.admin? %>
|
||||||
|
<% if @forum.safe_attribute? 'sticky' %>
|
||||||
|
<%= f.check_box :sticky %>
|
||||||
|
<%= label_tag 'message_sticky', l(:label_board_sticky) %>
|
||||||
|
<% end %>
|
||||||
|
<% if @forum.safe_attribute? 'locked' %>
|
||||||
|
<%= f.check_box :locked %>
|
||||||
|
<%= label_tag 'message_locked', l(:label_board_locked) %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p style="max-width:680px">
|
||||||
|
<%= f.kindeditor :description, :required => true,:owner_id => @forum.id,:owner_type => 2 %>
|
||||||
|
</p>
|
||||||
|
<!-- <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
|
||||||
|
|
||||||
|
<p style="color: #ff0000">
|
||||||
|
(<%= l(:label_forums_max_length) %>)
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="actions" style=" padding-top: 10px; float:right">
|
||||||
|
<%= submit_tag l(:button_submit) %>
|
||||||
|
<%= link_to l(:button_back), forums_path ,:style => 'font-size: 14px; padding: 0px 3px;' %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
@ -1,4 +1,4 @@
|
|||||||
<!-- added by fq -->
|
<!-- added by fq -->
|
||||||
<h1>编辑讨论区</h1>
|
<h1>编辑讨论区</h1>
|
||||||
|
<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
|
||||||
<%= render 'form' %>
|
<%= render 'form_edit_mode' %>
|
||||||
|
|||||||
@ -1,139 +0,0 @@
|
|||||||
<div class="project_r_h">
|
|
||||||
<h2 class="project_h2">问题跟踪</h2>
|
|
||||||
</div>
|
|
||||||
<div class="problem_top">
|
|
||||||
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
|
|
||||||
<span>
|
|
||||||
<% if User.current.member_of?(@project) %>
|
|
||||||
<%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
|
|
||||||
:html => {:accesskey => Redmine::AccessKeys.key_for(:new_issue)}, :class => 'icon icon-add' %>
|
|
||||||
<% end %>
|
|
||||||
<%= link_to l(:label_query), '#', :class => 'icon icon-help',
|
|
||||||
:onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
|
|
||||||
</span>
|
|
||||||
<% end %>
|
|
||||||
<span class="problem_p fr">问题总数：<span><%= @project.issues.count %></span> 未解决：<span><%= @project.issues.where('status_id in (1,2,4,6)').count %></span></span>
|
|
||||||
</div>
|
|
||||||
<div class="contextual">
|
|
||||||
<% if !@query.new_record? && @query.editable_by?(User.current) %>
|
|
||||||
<%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
|
|
||||||
<%= delete_link query_path(@query) %>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
|
|
||||||
<div style="clear:right; ">
|
|
||||||
<%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get, :id => 'query_form', :class => 'query_form') do %>
|
|
||||||
<%= hidden_field_tag 'set_filter', '1' %>
|
|
||||||
|
|
||||||
<div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
|
|
||||||
<span>---<%= l :label_query_new %>---</span>
|
|
||||||
|
|
||||||
<div id="query_form_content" class="hide-when-print">
|
|
||||||
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
|
|
||||||
<legend onclick="toggleFieldset(this);">
|
|
||||||
<%= l(:label_issue_query_condition) %>
|
|
||||||
</legend>
|
|
||||||
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
|
|
||||||
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
|
|
||||||
</div>
|
|
||||||
</fieldset>
|
|
||||||
<!--
|
|
||||||
<fieldset class="collapsible collapsed">
|
|
||||||
<legend onclick="toggleFieldset(this);">
|
|
||||||
<%= l(:label_options) %>
|
|
||||||
</legend>
|
|
||||||
<div style="display: none;">
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td><%= l(:field_column_names) %></td>
|
|
||||||
<td><%= render_query_columns_selection(@query) %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td><label for='group_by'><%= l(:field_group_by) %></label></td>
|
|
||||||
<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td><%= l(:button_show) %></td>
|
|
||||||
<td><%= available_block_columns_tags(@query) %></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</fieldset>
|
|
||||||
-->
|
|
||||||
<div class="buttons hide-when-print">
|
|
||||||
<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
|
|
||||||
<%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<%= error_messages_for 'query' %>
|
|
||||||
|
|
||||||
<% if @query.valid? %>
|
|
||||||
<% if @issues.empty? %>
|
|
||||||
<p class="nodata">
|
|
||||||
<%= l(:label_no_data) %>
|
|
||||||
</p>
|
|
||||||
<% else %>
|
|
||||||
<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
|
|
||||||
<div class="pagination">
|
|
||||||
<ul><%= pagination_links_full @issue_pages, @issue_count %></ul>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
|
||||||
<div style="float: right; padding-top: 30px">
|
|
||||||
<% other_formats_links do |f| %>
|
|
||||||
<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
|
|
||||||
<%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
|
|
||||||
<%= f.link_to 'PDF', :url => params %>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div id="csv-export-options" style="display:none;">
|
|
||||||
<h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
|
|
||||||
<%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
|
|
||||||
<p>
|
|
||||||
<label>
|
|
||||||
<%= radio_button_tag 'columns', 'all' %>
|
|
||||||
<%= l(:description_all_columns) %>
|
|
||||||
</label>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<label>
|
|
||||||
<%= check_box_tag 'description', '1', @query.has_column?(:description) %>
|
|
||||||
<%= l(:field_description) %>
|
|
||||||
</label>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p class="buttons">
|
|
||||||
<%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
|
|
||||||
<%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
|
|
||||||
</p>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<%= call_hook(:view_issues_index_bottom, {:issues => @issues, :project => @project, :query => @query}) %>
|
|
||||||
|
|
||||||
<% content_for :sidebar do %>
|
|
||||||
<%= render :partial => 'issues/sidebar' %>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<% content_for :header_tags do %>
|
|
||||||
<%= auto_discovery_link_tag(:atom,
|
|
||||||
{:query_id => @query, :format => 'atom',
|
|
||||||
:page => nil, :key => User.current.rss_key},
|
|
||||||
:title => l(:label_issue_plural)) %>
|
|
||||||
<%= auto_discovery_link_tag(:atom,
|
|
||||||
{:controller => 'journals', :action => 'index',
|
|
||||||
:query_id => @query, :format => 'atom',
|
|
||||||
:page => nil, :key => User.current.rss_key},
|
|
||||||
:title => l(:label_changes_details)) %>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<%= context_menu issues_context_menu_path %>
|
|
||||||
@ -1 +0,0 @@
|
|||||||
$('#content').html('<%= escape_javascript(render :partial => 'issues/newissue_index') %>');
|
|
||||||
@ -1,49 +1,46 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="<%= current_language %>">
|
<html lang="<%= current_language %>">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<title><%=h html_title %></title>
|
<title><%=h html_title %></title>
|
||||||
<meta name="description" content="<%= Redmine::Info.app_name %>" />
|
<%= render :partial => "layouts/point_browser" %>
|
||||||
<meta name="keywords" content="issue,bug,tracker" />
|
<meta name="description" content="<%= Redmine::Info.app_name %>" />
|
||||||
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
|
<meta name="keywords" content="issue,bug,tracker" />
|
||||||
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
|
<%= csrf_meta_tag %>
|
||||||
<%= javascript_include_tag "jquery.leanModal.min" %>
|
<%= favicon %>
|
||||||
<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
|
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
|
||||||
|
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
|
||||||
<%= csrf_meta_tag %>
|
<%= javascript_heads %>
|
||||||
<%= favicon %>
|
<%= javascript_include_tag "jquery.leanModal.min" %>
|
||||||
<%= javascript_heads %>
|
<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
|
||||||
<%= heads_for_theme %>
|
<%= heads_for_theme %>
|
||||||
<%= call_hook :view_layouts_base_html_head %>
|
<%= call_hook :view_layouts_base_html_head %>
|
||||||
<!-- page specific tags -->
|
<!-- page specific tags -->
|
||||||
<%= yield :header_tags -%>
|
<%= yield :header_tags -%>
|
||||||
</head>
|
</head>
|
||||||
<body class="<%=h body_css_classes %>">
|
<body class="<%=h body_css_classes %>">
|
||||||
<div id="wrapper">
|
<div id="wrapper">
|
||||||
<div id="wrapper2">
|
<div id="wrapper2">
|
||||||
<div id="wrapper3">
|
<div id="wrapper3">
|
||||||
<%=render :partial => 'layouts/base_header'%>
|
<%=render :partial => 'layouts/base_header'%>
|
||||||
<div id="main" class="nosidebar">
|
<div id="main" class="nosidebar">
|
||||||
<div id="content_">
|
<div id="content_">
|
||||||
<%= render_flash_messages %>
|
<%= render_flash_messages %>
|
||||||
<%= yield %>
|
<%= yield %>
|
||||||
<%= call_hook :view_layouts_base_content %>
|
<%= call_hook :view_layouts_base_content %>
|
||||||
<div style="clear:both;"></div>
|
<div style="clear:both;"></div>
|
||||||
<%=render :partial => 'layouts/base_footer'%>
|
<%=render :partial => 'layouts/base_footer'%>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="ajax-indicator" style="display:none;">
|
|
||||||
<span>
|
|
||||||
<%= l(:label_loading) %>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div id="ajax-modal" style="display:none;"></div>
|
|
||||||
|
|
||||||
|
<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
|
||||||
|
<div id="ajax-modal" style="display:none;"></div>
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<%= call_hook :view_layouts_base_body_bottom %>
|
</div>
|
||||||
|
<%= call_hook :view_layouts_base_body_bottom %>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
<% if isregisted %>
|
<% if isregisted %>
|
||||||
<p style="color: #ff0000"><%= l(:notice_registed_success) %></p>
|
<p style="color: #ff0000"><%= l(:notice_registed_error) %></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,32 +1,30 @@
|
|||||||
<div id="tags_show">
|
<div id="tags_show" style="float: left;">
|
||||||
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
|
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
|
||||||
</div>
|
</div>
|
||||||
|
<div style="float: left;">
|
||||||
<% if User.current.logged? %>
|
<% if User.current.logged? %>
|
||||||
<span> <%= toggle_link (l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
|
<span> <%= toggle_link (l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<div id="put-tag-form" style="display: none;text-align: center">
|
<div id="put-tag-form" style="display: none;text-align: center">
|
||||||
<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
|
<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
|
||||||
:update => "tags_show",
|
:update => "tags_show",
|
||||||
:complete => '$("#put-tag-form").slideUp();' do |f| %>
|
:complete => '$("#put-tag-form").slideUp();' do |f| %>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<%= f.text_field :name ,:id => "tags_name",:size=>"20",
|
<%= f.text_field :name ,:id => "tags_name",:size=>"20",
|
||||||
:require=>true,
|
:require=>true,
|
||||||
:maxlength => Setting.tags_max_length,
|
:maxlength => Setting.tags_max_length,
|
||||||
:minlength=>Setting.tags_min_length %>
|
:minlength=>Setting.tags_min_length %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
|
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
|
||||||
|
|
||||||
|
|
||||||
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
|
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
|
||||||
|
<td style="margin-left: 5px" vertical-valign="middle" >
|
||||||
<td style="margin-left: 5px">
|
|
||||||
<a href="#" onclick='$("#tags_name").parent().submit();' type="button" class="submit f_l"></a>
|
<a href="#" onclick='$("#tags_name").parent().submit();' type="button" class="submit f_l"></a>
|
||||||
</td>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
</table>
|
</table>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue