Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

app/controllers/repositories_controller.rb

@@ -265,6 +265,7 @@ update
       end
       @repository.project = @project
       @repository.type = 'Repository::Gitlab'
+      @repository.identifier = @repository.identifier.downcase
       @repository.url = @repository.identifier
       if request.post? && @repository.save
         s = Trustie::Gitlab::Sync.new

app/views/projects/forked_pop.js.erb

@@ -1,3 +1,3 @@
 var htmlvalue = "<%= escape_javascript(render :partial => 'repositories/forked_popbox') %>";
-pop_box_new(htmlvalue,820,316);
+pop_box_new(htmlvalue,320,316);
 

app/views/repositories/_forked_popbox.html.erb

@@ -0,0 +1 @@
+666

app/views/repositories/_link_to_functions.html.erb

@@ -1,15 +1,25 @@
 <% if @entry && @entry.kind == 'file' %>
-<%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5"%>
-<%# if @repository.supports_cat? %>
-    <%#= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr" %>
-<%# end %>
+    <% if action_name != 'entry' %>
+        <%= link_to l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5"%>
+    <% else %>
+        <a class="fr mr5"><%= l(:label_history) %></a>
+    <% end %>
+
+    <% if @repository.supports_cat? %>
+        <% if action_name != 'entry' %>
+            <%= link_to l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5" %>
+        <% else %>
+            <a class="fr mr5"><%= l(:button_view) %></a>
+        <% end %>
+
+    <% end %>
 <%# if @repository.supports_annotate? %>
     <%#= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %>
 <%# end %>
-<%= link_to(l(:button_download),
-            {:action => 'raw', :id => @project,
-             :repository_id => @repository.identifier_param,
-             :path => to_path_param(@path),
-             :rev => @rev}, :class => "fr mr5") if @repository.supports_cat? %>
-<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
+    <%= link_to(l(:button_download),
+                {:action => 'raw', :id => @project,
+                 :repository_id => @repository.identifier_param,
+                 :path => to_path_param(@path),
+                 :rev => @rev}, :class => "fr mr5") if @repository.supports_cat? %>
+    <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
 <% end %>

app/views/repositories/changes.html.erb

@@ -9,7 +9,7 @@
     <div class="cl"></div>
   </div>
 
-  <%#= render :partial => 'link_to_functions' %>
+  <%= render :partial => 'link_to_functions' %>
 
   <%= render_properties(@properties) %>
 

app/views/repositories/forked_popbox.html.erb

@@ -1,7 +0,0 @@
-<div id="muban_popup_box" style="width:820px;">
-  <div class="muban_popup_top">
-    <h3 class="fl">新建里程碑</h3>
-    <a href="javascript:void(0);" class="muban_icons_close fr" onclick="hideModal()"></a>
-    <div class="cl"></div>
-  </div>
-</div>