版本库git帮助文档的显示与隐藏
This commit is contained in:
whimlex
parent
2323c821d6
commit
40fdda0ee2
|
|
@ -4,5 +4,5 @@
|
|||
<%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
|
||||
|
||||
|
||||
<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("all_attributes", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
|
||||
<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
|
||||
<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project) %>
|
||||
|
|
|
|||
|
|
@ -8,55 +8,80 @@
|
|||
:locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
|
||||
<%= render :partial => 'navigation' %>
|
||||
|
||||
</div><!--contextual end-->
|
||||
</div>
|
||||
<!--contextual end-->
|
||||
<div class="cl"></div>
|
||||
<div class=" c_dark f14">
|
||||
<p > <%if @repository.type.to_s=="Repository::Git"%>
|
||||
<p>
|
||||
<% if @repository.type.to_s=="Repository::Git" %>
|
||||
<%= @repos_url %>
|
||||
<% else %>
|
||||
<%= h @repository.url %>
|
||||
<% end %>
|
||||
</p>
|
||||
<p class="mb10 word_break">
|
||||
|
||||
<p class="mb10 break_word">
|
||||
(<%= l(:label_all_revisions) %><%= @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' : ''),
|
||||
:class => "mb10 word_break c_orange"}.join(' | ').html_safe %>)
|
||||
:class => "mb10 break_word c_orange" }.join(' | ').html_safe %>)
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="repos_more"><a id="showgithelp" value="show_help" onclick ="showhelpAndScrollTo('repos_git_more','repos_git_more'); return false;" class="c_dblue">显示Git操作指南</a></div>
|
||||
<div id="repos_git_more" style="display:none;">
|
||||
<br>
|
||||
<div class=" c_dark f14">
|
||||
<p>项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码</p>
|
||||
|
||||
<p>建立版本库文件夹，打开命令行执行如下：</p>
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
<p>git init</p>
|
||||
|
||||
<p>git add *</p>
|
||||
|
||||
<p>git commit -m "first commit"</p>
|
||||
|
||||
<p>git remote add origin
|
||||
http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git
|
||||
</p>
|
||||
|
||||
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
|
||||
|
||||
<p>git push -u origin master:master</p>
|
||||
</div><!--repos_explain end-->
|
||||
</div>
|
||||
<!--repos_explain end-->
|
||||
<div class="c_dark f14">
|
||||
<p>已经有本地库，还没有配置远程地址，打开命令行执行如下：</p>
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
<p>git remote add origin http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git</p>
|
||||
|
||||
<p>git add .</p>
|
||||
|
||||
<p>git commit -m "first commit"</p>
|
||||
|
||||
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
|
||||
|
||||
<p>git push -u origin master:master</p>
|
||||
</div><!--repos_explain end-->
|
||||
</div>
|
||||
<!--repos_explain end-->
|
||||
<div class="c_dark f14">
|
||||
<p>已有远程地址，创建一个远程分支，并切换到该分支，打开命令行执行如下：</p>
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
<p>git clone http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git</p>
|
||||
|
||||
<p>git push</p>
|
||||
|
||||
<p>git checkout -b branch_name</p>
|
||||
|
||||
<p>git push origin branch_name</p>
|
||||
</div><!--repos_explain end-->
|
||||
</div>
|
||||
<!--repos_explain end-->
|
||||
<div class="c_dark f14">
|
||||
<p>从网上获取别人的开源版本库，转交到trustie网站上，打开命令行执行如下：</p>
|
||||
</div>
|
||||
|
|
@ -64,13 +89,18 @@
|
|||
<p>git remote add trustie
|
||||
http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git
|
||||
</p>
|
||||
|
||||
<p>git add .</p>
|
||||
|
||||
<p>git commit -m "first commit"</p>
|
||||
|
||||
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
|
||||
|
||||
<p>git push -u trustie master:master</p>
|
||||
|
||||
<p><a href="/users/646" class="c_orange">李海</a>提供</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
|
||||
<%= render :partial => 'dir_list' %>
|
||||
<% end %>
|
||||
|
|
@ -119,6 +149,7 @@
|
|||
<p class="fb c_dark mt10">查看如何提交代码：
|
||||
<%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "c_blue") %>
|
||||
<%= link_to('English', en_usage_path, :class => "c_blue") %>
|
||||
|
||||
<div class="cl"></div>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -59,6 +59,27 @@ function show_more_msg() {
|
|||
}
|
||||
}
|
||||
|
||||
function showhelpAndScrollTo(id, focus) {
|
||||
var information = $("#showgithelp");
|
||||
var val = information.attr("value");
|
||||
if (val == "show_help") {
|
||||
$("#showgithelp").text("收起Git操作指南");
|
||||
information.attr("value", "hide_help");
|
||||
$('#' + id).show();
|
||||
if (focus !== null) {
|
||||
$('#' + focus).focus();
|
||||
}
|
||||
$('html, body').animate({scrollTop: $('#' + id).offset().top}, 400);
|
||||
}
|
||||
else {
|
||||
$("#showgithelp").text("显示Git操作指南");
|
||||
information.attr("value", "show_help");
|
||||
$('#' + id).hide();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////
|
||||
//////////////////////////////////////////////////////////////项目讨论区
|
||||
function regexSubject() {
|
||||
|
|
@ -191,26 +212,21 @@ function project_setting(n) {
|
|||
}
|
||||
|
||||
//配置-验证项目名称
|
||||
function regex_project_name()
|
||||
{
|
||||
function regex_project_name() {
|
||||
var name = $.trim($("#project_name").val());
|
||||
if(name.length == 0)
|
||||
{
|
||||
if (name.length == 0) {
|
||||
$("#project_name_notice").show();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
$("#project_name_notice").hide();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
//配置-信息提交
|
||||
function submit_edit_project(id)
|
||||
{
|
||||
if(regex_project_name())
|
||||
{
|
||||
function submit_edit_project(id) {
|
||||
if (regex_project_name()) {
|
||||
$("#edit_project_" + id).submit();
|
||||
}
|
||||
}
|
||||
|
|
@ -239,6 +255,7 @@ function showAndScrollTo(id, focus) {
|
|||
$('#' + focus).focus();
|
||||
}
|
||||
$('html, body').animate({scrollTop: $('#' + id).offset().top}, 400);
|
||||
}
|
||||
|
||||
|
||||
/*缺陷完成度决定缺陷状态*/
|
||||
|
|
@ -288,6 +305,3 @@ function showAndScrollTo(id, focus) {
|
|||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -177,7 +177,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
|
|||
a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; }
|
||||
a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
|
||||
.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
|
||||
|
||||
.repos_more{height:23px; width:100%; border:1px solid #CCC; background:#F6F6F6; text-align:center; font-size:12px; padding-top:2px;}
|
||||
|
||||
/* 弹框 新样式还没设计出来，暂时用的课程那边的样式 */
|
||||
.alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(images/close.png) no-repeat;cursor:pointer;}
|
||||
|
|
|
|||
Loading…
Reference in New Issue