修改了项目里各form的显示样式

This commit is contained in:
zhangyang 2013-08-03 22:18:30 +08:00
parent d521f95354
commit a7871c63b2
18 changed files with 51 additions and 49 deletions

View File

@ -16,6 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class BoardsController < ApplicationController
layout 'base_projects'#by young
default_search_scope :messages
before_filter :find_project_by_project_id, :find_board_if_available, :authorize
accept_rss_auth :index, :show

View File

@ -49,7 +49,7 @@ class MessagesController < ApplicationController
all
@reply = Message.new(:subject => "RE: #{@message.subject}")
render :action => "show", :layout => false if request.xhr?
render :action => "show", :layout => "base_projects"#by young
end
# Create a new topic

View File

@ -46,7 +46,7 @@ class PreviewsController < ApplicationController
def find_project
project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
@project = Project.find(project_id)
rescue ActiveRecord::RecordNotFound
rescue ActiveRecord::RecordNotFound
render_404
end

View File

@ -1,5 +1,5 @@
<style type="text/css">
a, a:hover {text-decoration:none;width:50px;}
a, a:hover {text-decoration:none;}
.btn_addPic
{
position: relative;

View File

@ -1,8 +1,8 @@
<%= error_messages_for @board %>
<div class="box tabular">
<p><%= f.text_field :name, :required => true %></p>
<p><%= f.text_field :description, :required => true, :size => 80 %></p>
<p style="width:666;"><%= f.text_field :name, :required => true %></p><!--by young-->
<p><%= f.text_field :description, :required => true, :size => 30 %></p><!--by young-->
<% if @board.valid_parents.any? %>
<p><%= f.select :parent_id, boards_options_for_select(@board.valid_parents), :include_blank => true, :label => :field_board_parent %></p>
<% end %>

View File

@ -1,4 +1,4 @@
<h3 style="padding-top:40px;"><%=l(:label_issue_category_new)%></h3>
<h3><%=l(:label_issue_category_new)%></h3>
<%= labelled_form_for @category, :as => :issue_category,
:url => project_issue_categories_path(@project) do |f| %>

View File

@ -18,19 +18,20 @@
<% end %>
<% if @issue.safe_attribute? 'subject' %>
<p><%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true %></p>
<p><%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true, :style => "font-size:small" %></p>
<% end %>
<% if @issue.safe_attribute? 'description' %>
<p>
<p style="margin-left:-10px;">
<%= f.label_for_field :description, :required => @issue.required_attribute?('description') %>
<%= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
<%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
<%= f.text_area :description,
<%= f.text_area :description,
:cols => 60,
:rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
:accesskey => accesskey(:edit),
:class => 'wiki-edit',
:style => "font-size:small;width:520px;",
:no_label => true %>
<% end %>
</p>

View File

@ -10,7 +10,7 @@
<%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
:method => :get, :id => 'query_form') do %>
<%= hidden_field_tag 'set_filter', '1' %>
<div id="query_form_content" class="hide-when-print" style="padding-top:40px;">
<div id="query_form_content" class="hide-when-print">
<fieldset id="filters" style="width:650px;" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
<legend onclick="toggleFieldset(this);">
<%= l(:label_filter_plural) %>

View File

@ -4,7 +4,7 @@
<div class="box">
<!--[form:message]-->
<p><label for="message_subject"><%= l(:field_subject) %></label><br />
<%= f.text_field :subject, :size => 120, :id => "message_subject" %>
<%= f.text_field :subject, :size => 90, :id => "message_subject" %><!--by young-->
<% unless replying %>
<% if @message.safe_attribute? 'sticky' %>

View File

@ -1,10 +1,10 @@
<%= error_messages_for @news %>
<div class="box tabular">
<p><%= f.text_field :title, :required => true, :size => 60 %></p>
<p><%= f.text_area :summary, :cols => 60, :rows => 2 %></p>
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit' %></p>
<p id="attachments_form"><label><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
<p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p>
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit', :style => "width:490px;" %></p>
<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
</div>
<%= wikitoolbar_for 'news_description' %>

View File

@ -3,18 +3,18 @@
<div class="box tabular" style="margin-right:10px;" >
<!--[form:project]-->
<p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project}%></p>
<p><%= f.text_field :name, :required => true, :size => 60 %></p>
<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
<p><%= f.text_area :description, :rows => 8, :class => 'wiki-edit' %></p>
<p><%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
<p><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
<% unless @project.identifier_frozen? %>
<em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
<% end %></p>
<p><%= f.text_field :homepage, :size => 60 %></p>
<p><%= f.check_box :is_public %></p>
<p style="margin-left:-10px;"><%= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
<p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p>
<% unless @project.allowed_parents.compact.empty? %>
<p><%= label(:project, :parent_id, l(:field_parent)) %><%= parent_project_select_tag(@project) %></p>
<p style="margin-left:-10px;"><%= label(:project, :parent_id, l(:field_parent)) %><span style="margin-left:10px;"><%= parent_project_select_tag(@project) %></span></p>
<% end %>
<% if @project.safe_attribute? 'inherit_members' %>

View File

@ -1,4 +1,4 @@
<h3 style="padding-top:40px;"><%=l(:label_settings)%></h3>
<h3><%=l(:label_settings)%></h3>
<%= render_tabs project_settings_tabs %>

View File

@ -1,4 +1,4 @@
<h3 style="padding-top:40px;"><%= l(:label_repository_new) %></h3>
<h3><%= l(:label_repository_new) %></h3>
<%= labelled_form_for :repository, @repository, :url => project_repositories_path(@project), :html => {:id => 'repository-form'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %>

View File

@ -1,11 +1,23 @@
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<div class="contextual" style="padding-top: 30px;padding-right: 10px;">
<div class="contextual" style="padding-right: 10px;">
<%= render :partial => 'navigation' %>
</div>
<h3 style="padding-top: 40px;"><%= render :partial => 'breadcrumbs',
:locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h3>
<h3>
<%= render :partial => 'breadcrumbs',
:locals => { :path => @path, :kind => 'dir', :revision => @rev } %>
<% if @repositories.size > 1 %>
<p style="margin:0;">
(所有版本:<%= @repositories.sort.collect {|repo|
link_to h(repo.name),
{:controller => 'repositories', :action => 'show',
:id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil},
:class => 'repository' + (repo == @repository ? ' selected' : '')
}.join('&nbsp|&nbsp').html_safe %>)</p>
<% end %>
</h3>
<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
<%= render :partial => 'dir_list' %>
@ -56,19 +68,7 @@
<% end %>
<% end %>
<% if @repositories.size > 1 %>
<% content_for :sidebar do %>
<h3><%= l(:label_repository_plural) %></h3>
<p>
<%= @repositories.sort.collect {|repo|
link_to h(repo.name),
{:controller => 'repositories', :action => 'show',
:id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil},
:class => 'repository' + (repo == @repository ? ' selected' : '')
}.join('<br />').html_safe %>
</p>
<% end %>
<% end %>
<% content_for :header_tags do %>
<%= stylesheet_link_tag "scm" %>

View File

@ -2,15 +2,15 @@
<%= error_messages_for 'version' %>
<div class="box tabular">
<p><%= f.text_field :name, :size => 60, :required => true %></p>
<p><%= f.text_field :description, :size => 60 %></p>
<p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
<p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
<p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
<p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
<p style="margin-left:-10px;"><%= f.text_field :name, :size => 60, :required => true %></p>
<p style="margin-left:-20px;"><%= f.text_field :description, :size => 60, :style => "margin-left:10px;" %></p>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></span></p>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></span></p>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></span></p>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></span></p>
<% @version.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :version, value %></p>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= custom_field_tag_with_label :version, value %></span></p>
<% end %>
</div>

View File

@ -9,7 +9,7 @@
<% else %>
<div id="roadmap">
<% @versions.each do |version| %>
<h3 class="version"><%= link_to_version version, :name => version_anchor(version) %></h3>
<h3 class="version"><p style="padding-left: 10px;"><%= link_to_version version, :name => version_anchor(version) %></p></h3>
<%= render :partial => 'versions/overview', :locals => {:version => version} %>
<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>

View File

@ -13,7 +13,7 @@
}
.jstElements {
padding: 3px 3px 3px 0;
padding: 3px 3px 3px 10px;/*by young*/
}
.jstElements button {

View File

@ -633,7 +633,7 @@ div.splitcontentleft h2
#top-menu li a.home:before {
font-family: Fontawesome;
content: "\f015 ";
/*content: "\f015 "; */
}
#top-menu li a.my-page:before {
font-family: Fontawesome;