Merge branch 'pre_trustie_server' into trustie_server

app/views/admins/project_licenses/_form.html.erb

@@ -30,6 +30,18 @@
 
 
 
+  </div>
+  <div class="form-group">
+    <label>
+      <span class="color-grey-6 pt10">
+        排序等级
+        <span class="ml10 color-orange mr20">*</span>
+      </span>
+    </label>
+    <div class="mt-10">
+      <%= f.number_field :position, class: "form-control",placeholder: ""%>
+    </div>
+
   </div>
   <div class="form-group">
     <%= f.submit "确认", class: "btn btn-primary submit-btn" %>

app/views/admins/project_licenses/_list.html.erb

@@ -4,6 +4,7 @@
     <th width="5%">序号</th>
     <th width="15%">名称</th>
     <th width="35%">简介</th>
+    <th width="10%"><%= sort_tag('排序等级', name: 'position', path: admins_project_licenses_path) %></th>
     <%
 =begin%>
  <th width="10%"><%= sort_tag('项目数', name: 'projects_count', path: admins_project_licenses_path) %></th> 
@@ -24,6 +25,7 @@
         <td>
             <%= project_license.content.to_s.truncate(200) %>
         </td>
+        <td><%= project_license.position %></td>
         <%
 =begin%>
  <td><%= project_license.projects_count %></td>