From 34a8d0890c52d41c561eaa77950f3ab190e5e827 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 26 Oct 2015 17:18:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=94=BF=E6=96=B0=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- app/views/repositories/_navigation.html.erb | 21 +++---- app/views/repositories/show.html.erb | 62 ++++++++++++++------ public/images/vlicon/branch_icon.png | Bin 0 -> 1258 bytes public/images/vlicon/clone_url.png | Bin 0 -> 1434 bytes public/images/vlicon/commit_icon.png | Bin 0 -> 1379 bytes public/images/vlicon/download_icon.png | Bin 0 -> 1457 bytes public/images/vlicon/fork_icon.png | Bin 0 -> 1188 bytes public/javascripts/project.js | 6 ++ public/stylesheets/repository.css | 13 ++++ 10 files changed, 73 insertions(+), 31 deletions(-) create mode 100644 public/images/vlicon/branch_icon.png create mode 100644 public/images/vlicon/clone_url.png create mode 100644 public/images/vlicon/commit_icon.png create mode 100644 public/images/vlicon/download_icon.png create mode 100644 public/images/vlicon/fork_icon.png diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 9da22577f..b0ad4d9c1 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -243,7 +243,7 @@ update # :name, :path, :kind, :size, :lastrev, :changeset @entries = @repository.entries(@path, @rev) # @trees = g.trees(project, @path) - @changeset = @repository.find_changeset_by_name(@rev) + # @changeset = @repository.find_changeset_by_name(@rev) #@project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT #@ip = RepositoriesHelper::REPO_IP_ADDRESS diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb index 2fdf00cef..7140c6238 100644 --- a/app/views/repositories/_navigation.html.erb +++ b/app/views/repositories/_navigation.html.erb @@ -5,23 +5,21 @@ <%#= link_to l(:label_statistics), {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param}, :class => 'mt3 c_blue fl' if @repository.supports_all_revisions? %> -
- <%= form_tag({:action => controller.action_name, - :id => @project, - :repository_id => @repository.identifier_param, - :path => to_path_param(@path), - :rev => nil}, - {:method => :get, :id => 'revision_selector', :class => "fl c_grey02"}) do -%> +
+ <%= form_tag({:action => controller.action_name, :id => @project, :repository_id => @repository.identifier_param, + :path => to_path_param(@path), + :rev => nil}, + {:method => :get, :id => 'revision_selector', :class => "fl c_grey02 ml5"}) do -%> <% if !@repository.branches.nil? && @repository.branches.length > 0 -%> <%= l(:label_branch) %>: <%= select_tag :branch, options_for_select([''] + @repository.branches, @rev), :id => 'branch' %> <% end -%> - <% if !@repository.tags.nil? && @repository.tags.length > 0 -%> - | <%= l(:label_tag) %>: - <%= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag' %> - <% end -%> + <%# if !@repository.tags.nil? && @repository.tags.length > 0 -%> + + <%#= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag' %> + <%# end -%> <%# if @repository.supports_all_revisions? %> <%#= l(:label_revision) %> @@ -29,4 +27,3 @@ <%# end %> <% end -%>
- diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index bc0ff18be..eca7a3322 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -3,28 +3,54 @@

<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

- <%= render :partial => 'navigation' %> -
-
- <% if @entries.nil? && authorize_for('repositories', 'browse') %> -
- 该版本库还没有上传代码! -
- <% end %> - <% if @repository.type.to_s=="Repository::Gitlab" %> - 版本库地址：<%= @repos_url %> - <% else %> - 版本库地址：<%= h @repository.url %> - <% end %> - -
点击查看如何提交代码
-
-
+ <% if @entries.nil? %> + <%# 未提交代码提示 %> +
+ <% if @entries.nil? && authorize_for('repositories', 'browse') %> +
+ 该版本库还没有上传代码! +
+ <% end %> + <% if @repository.type.to_s=="Repository::Gitlab" %> + 版本库地址：<%= @repos_url %> + <% else %> + 版本库地址：<%= h @repository.url %> + <% end %> + +
点击查看如何提交代码
+
+
+ <% else %> + <%= render :partial => 'navigation' %> +
克隆网址:
+ + +
ZIP
+
Fork 109
+
+
+ 头像 + <%#= @user_chageset_recently.user %>提交于两天前：<%#= @user_chageset_recently.comments %> + + <%= @repository.branches.count %>个分支 + + + <%=link_to @changesets.count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev} %>提交 + +
+ <% end %>
+ <% if !@entries.nil? && authorize_for('repositories', 'browse') %> <%# 数据统计 %> - <%= render :partial => 'summary' %> + <%#= render :partial => 'summary' %> <%# end %> <%= render :partial => 'dir_list' %> <% end %> diff --git a/public/images/vlicon/branch_icon.png b/public/images/vlicon/branch_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c80e171344ed9141f8cbe09b47726e3b86110fe8 GIT binary patch literal 1258 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy`!3HFMdEYGqQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?_nZLn2Bde0{8v^Kf6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M( zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ2+zz*$uBR~ z1grP;werj>E=kNwPW5!LRRWrzmzkMj<>qGWYH8tYZ0>02W@zYYYGGz<>S$r%Vs7YU zYGPzz1k>x1pIn-onpXnTn}X15f>SRjDdZLaZFWg5$}CGwaVyHtRRDY0DigO`3~`zV z)tiFbEk-!?>H{644~kf%h=vIPQxAvXofw-^Ql2Ty+Z>r&qN$n<%g4L^d^GPRaoob`1F&(6BPR&&m_#2&nK zLD#%e;@9ur;>(xr{QG3*PS>QDUtcdgvSUK4$NVLXALTZrdheEQ)Z5Qo`crzr>FtYG zuvALQW@ls={ITDCv-sJWnR6BP{Cx9YX~T{Gn|$1o7~sI+RcGlr+54(#iDEx+X4BNtMmibn*6IE9xuvW?$2JeCW`jbNa9B zcrMPGwfdx)z^hNQ6Q+M&wep38;hv=@S``ZNPD}1jS76hZZ(hFanWjLmQ81z^g!?XbT|DL z&#&eaB~D+Mqx5jvv@*6C(Oy^V?5llq{1THE7##?=XxMbac8SimsWT2GZfTHhVPj&E ZU8U}fi7AzZCsS=07?_nZLn2Bde0{8v^Kf6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M( zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ2+zz*$uBR~ z1grP;werj>E=kNwPW5!LRRWrzmzkMjXzpm}W@zYY>S$nMVCn2)W@P5% z=;UVP2Gi@3pIn-onpXnTn}X2mgi|jlDdZLaZFWg5$}CGwaVyHtRRDY0DigO`EO43! z)tiFbEtWX->H{644~kf%h=vIPQxAv?Uu)E; zIc2ZEVp50z-3$oWbRz&w6)SEED@$9x(hdL>a z@LPr%%&j_dcKby7PZx;EJUTAHw>6$^R}PzA@7s0>Jz*}fHEr5QeCi8I(_+{Z&vswh zI=yUC+K+mL6pKw7vD(JPC!K9mB!A9$Iep#Pp4oj%zMZHK;%Q%U=6_h>=5{14uvu`H{J$`vPX?prP4whNp_*cD=XZ!d6epkXb z`-|dxHq2f)<>9S2E4-?D% zWG-xd&6&DrPAb1-j@Q;_@zNqse@-xzQ8>U5Z}{|E_#)4>pwiOQ)z4*}Q$iB}?_3bH literal 0 HcmV?d00001 diff --git a/public/images/vlicon/commit_icon.png b/public/images/vlicon/commit_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..148dbcd4b7874b8bf5edacbc29a29d294be3184d GIT binary patch literal 1379 zcmeAS@N?(olHy`uVBq!ia0vp^;y^6Q!3HGPJ}O-eq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1Ffc1+hD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Kep0RGSfuW&-nVFuU ziK&^Hp^k!)fuWJU0T7w#8k$&{npqi{D?ot~(6*wKG^-#NH>h1eo~=?wNlAf~zJ7Um zxn8-kUVc%!zM-Y1CCCgTBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`lk!VT zY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYexnUy@&(kzb(T9Bihb5uTZsl3!k| z30CjxYvq|&T#}fVoa*Ufs{}MbFEca6%Fxx)$fJ=uFhtzPEM|7 zP6p-{FugAM$)&lec_lEtDR8~61~~PCl0t3)&}Ns^qRg_?6t|-MTm`U~tuk@D#RaE% zP`xQQ-QwbkQ?EYIG5Vm0MT%&c5HR(CnDAr^>L1bUoY}<)pOl(tlmKOD?daGNDGPgEmZ(Tg$ELW@85@+>=56*|InCxWc z$mO&lSZ0a$iz*2#mR1fY*{VLL+Kbx9ZXB~J5tO$ns{H=r-QDu{ySaJUm`!xK|H>9P zo!G9jHq63Uw&ZQ^!-}YNt4__cpB^L?QmLLTA?O%7HF(ukFW$>LpC=eHtlpKpH*Vz? zool7X7wy>`bY^06=fU+-&(sd@I4)tlcR`)B-lNz9+;+xo>uearn;K$+uVk6Z9ydI` zM@edFBm+N;7bz&+N zxDZ;lFQr>xYDp%i^6QIzucoNQ#2pXwTRCm5C|9~^?=-t@>&l8-Yz`W5?mHd(;l~`4 z{_ld-C+(HD$VB{{Q2gQ33r)e3)-$;yK79K7eMQHD)z{oo`ySYQ5;%6C{Jxl)X!qT8 zrb7=ub2#xgK4{U9eX!xUoh6TnSLw~VlkpelF{r5}E)farlt{ literal 0 HcmV?d00001 diff --git a/public/images/vlicon/download_icon.png b/public/images/vlicon/download_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b442730fe3a69d88cbc7cc3ffc919869f21bd183 GIT binary patch literal 1457 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy}!3HFwFZ>e#Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?_nZLn2Bde0{8v^Kf6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M( zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ2+zz*$uBR~ z1grP;werj>E=kNwPW5!LRRWrzmzkMjSSc;W@%_(U}|b+ zXy|0_0@Le~pIn-onpXnTn}X15iBm5qDdZLaZFWg5$}CGwaVyHtRRDY0DigO`%y60q z)tiFbE#^4&>H{644~kf%h=vIPQxAvo;`1hQFfl1ZV#WAGf zR??sU|LvJg8HJgrGA?dwWAi&HrvGm7TXso3WtTUl+Wp(MUYC%_Ik@cKudlCf#8&*P z>F!rIKVq=^l=A!ib$@3Src|9_Wo>Kbd3)`m-OKKC*^{3f67zre|80Mg#4`Pp0-eSt zHQj3EB3jcqr|fRI-unF9+{bq1>wf;f=*+`YCipV~^@M&L%{4%*o=^gX7S(JwD`6!c=T$(uR+M_kfW?YxWmZ#4uER1E`{o%|^we`sk z={Kk8XE~blXdHik@NDgj*|#4TT%Kuc^nxwx^oiWGiXSJQJ^cTFO@Y3%@OQgE3D zw|iWD^l!@MHxILKf7mk3CHQisLZR3Urt`}*8~uff?&+N_OnC6@SzlYnEu);@=L0$l z-fgROc%N^}lVWA@gu(OY=D=XFoH=tdthkr4|6e? zZ~fPM96z&pHVdB(5dL<&Up{i<@%!JNmipa2=pMkz-_W$VBtE#jdFM~FoJjr@g?mho zUcEW8bLVOKQ;j!1O`I$rJA3k!4sYEX4mGXJJZF3_&bfa$;7~!WUy+hsX#z8QZ6$|5 Z0z>uf$IY8`uU-WeqMojPF6*2UngCHqFCYK_ literal 0 HcmV?d00001 diff --git a/public/images/vlicon/fork_icon.png b/public/images/vlicon/fork_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..45a6b0e82474d8a02aee3252c0c5f8610ed78a23 GIT binary patch literal 1188 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQ$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|81#=KlDb#X~hD#E>34K5C;EJ)Q4 zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y2=9ZF3nBND}m`vLFhHcsTY(KatnYqyQCInmZhe+73JqDfW2&$iQ6p(IL(9V zO~LIJL!5f`fsWA!MJ!T8!-RmT2gHOYTObFX@Kf`Esl5o8tcA+gi!m@TN_e_BhE&{2 z`t$$4J@ZxuVP;XrP~K!m@gIMF?t8cO@bfM6YS@b`QYCtFwyvw3IWyL-G)uZ|hm!vL z)IECD#c!*gm`9o~oHc9K)VxjiTh_%_3wQd@NxPTg((kL1KZ|*9u~4`9!$&N8Gt-`x zM*7SMmOr8ML`3W|yJU<1oQV8$zyCdH{IM!{xsAh|;N@YJHWi;@WmNpOn46lK9{jS6 zb#LzT1G8EsuH116+kdlE`-`lFQg57?dPQjCm6-i?b1kMe1ZgelI8GN(8OaKQ#3f`?1+dQL|3( zlzU%w{n90&eXk9#Tl?xxe5#VV+%b3_BZ~yX<%ETDFP@y|1(h3~u6{1-oD!M<81b7~ literal 0 HcmV?d00001 diff --git a/public/javascripts/project.js b/public/javascripts/project.js index c74ff18bf..d9138901a 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -511,3 +511,9 @@ function submitProjectFeedback() { $("#project_feedback_form").submit(); } +// 点击按钮复制功能 +function jsCopy(){ + var e=document.getElementById("copy_rep_content"); + e.select(); + document.execCommand("Copy"); +} \ No newline at end of file diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css index 0cb7d918e..ba3a419bf 100644 --- a/public/stylesheets/repository.css +++ b/public/stylesheets/repository.css @@ -205,3 +205,16 @@ table.list {margin-top:0.5em;} table.list th, table.list td {border: 1px solid #aaa;} } + +.cloneUrl {width:235px; height:21px; border:1px solid #dddddd; outline:none; overflow:hidden; line-height:21px; resize:none;} +.clone_btn {width:30px; height:21px; border-top:1px solid #dddddd; border-bottom:1px solid #dddddd; border-right:1px solid #dddddd; outline:none; float:left; background-image:linear-gradient(#FCFCFC, #EEE); text-align:center;} +.vl_btn {height:21px; padding:0px 5px; vertical-align:middle; border:1px solid #dddddd; float:left; line-height:21px; background-image:linear-gradient(#FCFCFC, #EEE);} +.vl_btn_2 {height:21px; padding:0px 5px; vertical-align:middle; border-top:1px solid #dddddd; border-bottom:1px solid #dddddd; border-right:1px solid #dddddd; float:left; line-height:21px;} +.recordBanner {width:670px; height:30px; background-color:#f1f1f1; color:#666666; line-height:30px; vertical-align:middle;} +.vl_copy {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;} +.vl_zip {background:url(../images/vlicon/download_icon.png) 0px 0px no-repeat; padding-left:22px;} +.vl_fork {background:url(../images/vlicon/fork_icon.png) 0px -2px no-repeat; padding-left:22px;} +.vl_commit {background:url(../images/vlicon/commit_icon.png) 0px -2px no-repeat; padding-left:22px;weight:20px;height: 24px;} +.vl_branch {background:url(../images/vlicon/branch_icon.png) 0px -2px no-repeat; padding-left:22px} +.mt1 {margin-top:1px;} +.mt2 {margin-top:2px;} \ No newline at end of file