cleaning dashboard & tags
This commit is contained in:
parent
98d6492582
commit
7157305d5e
|
@ -1,11 +0,0 @@
|
||||||
class TagsController < ApplicationController
|
|
||||||
def index
|
|
||||||
@tags = Project.tag_counts.order('count DESC')
|
|
||||||
@tags = @tags.where('name like ?', "%#{params[:term]}%") unless params[:term].blank?
|
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html
|
|
||||||
format.json { render json: @tags.limit(8).map {|t| t.name}}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,21 +0,0 @@
|
||||||
-#%h4.dash-tabs
|
|
||||||
= link_to "Activities", dashboard_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_path) || current_page?(root_path) }", :id => "activities_slide"
|
|
||||||
= link_to "Issues", dashboard_issues_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
|
|
||||||
= link_to "Merge Requests", dashboard_merge_requests_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
|
|
||||||
= image_tag "ajax-loader-facebook.gif", :class => "dashboard-loader"
|
|
||||||
|
|
||||||
:javascript
|
|
||||||
$(function(){
|
|
||||||
$(".dash-button").live("click", function() {
|
|
||||||
$(".dash-button").removeClass("active");
|
|
||||||
$(this).addClass("active");
|
|
||||||
});
|
|
||||||
|
|
||||||
$(".dash-button").live("ajax:before", function() {
|
|
||||||
$(".dashboard-loader").show();
|
|
||||||
});
|
|
||||||
|
|
||||||
$(".dash-button").live("ajax:complete", function() {
|
|
||||||
$(".dashboard-loader").hide();
|
|
||||||
});
|
|
||||||
});
|
|
|
@ -2,5 +2,4 @@
|
||||||
|
|
||||||
#dashboard-content.dashboard-content.content
|
#dashboard-content.dashboard-content.content
|
||||||
= render "dashboard/sidebar"
|
= render "dashboard/sidebar"
|
||||||
= render "dashboard/menu"
|
|
||||||
#news-feed.news-feed= render "dashboard/projects_feed"
|
#news-feed.news-feed= render "dashboard/projects_feed"
|
||||||
|
|
|
@ -2,5 +2,4 @@
|
||||||
|
|
||||||
#dashboard-content.dashboard-content.content
|
#dashboard-content.dashboard-content.content
|
||||||
= render "dashboard/sidebar"
|
= render "dashboard/sidebar"
|
||||||
= render "dashboard/menu"
|
|
||||||
#news-feed.news-feed= render "dashboard/issues_feed"
|
#news-feed.news-feed= render "dashboard/issues_feed"
|
||||||
|
|
|
@ -2,5 +2,4 @@
|
||||||
|
|
||||||
#dashboard-content.dashboard-content.content
|
#dashboard-content.dashboard-content.content
|
||||||
= render "dashboard/sidebar"
|
= render "dashboard/sidebar"
|
||||||
= render "dashboard/menu"
|
|
||||||
#news-feed.news-feed= render "dashboard/merge_requests_feed"
|
#news-feed.news-feed= render "dashboard/merge_requests_feed"
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
- content_for(:body_class, "projects-page")
|
|
||||||
- content_for(:page_title) do
|
|
||||||
.grid_4
|
|
||||||
%h2
|
|
||||||
Tags
|
|
||||||
|
|
||||||
.tags-list
|
|
||||||
- @tags.all.each do |tag|
|
|
||||||
= link_to "#{tag.name}(#{tag.count})", tag_path(name)
|
|
||||||
|
|
|
@ -4,8 +4,6 @@ Gitlab::Application.routes.draw do
|
||||||
require 'resque/server'
|
require 'resque/server'
|
||||||
mount Resque::Server.new, at: '/info/resque'
|
mount Resque::Server.new, at: '/info/resque'
|
||||||
|
|
||||||
get 'tags'=> 'tags#index'
|
|
||||||
get 'tags/:tag' => 'projects#index'
|
|
||||||
get 'help' => 'help#index'
|
get 'help' => 'help#index'
|
||||||
|
|
||||||
namespace :admin do
|
namespace :admin do
|
||||||
|
|
12
db/schema.rb
12
db/schema.rb
|
@ -13,18 +13,6 @@
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20120121122616) do
|
ActiveRecord::Schema.define(:version => 20120121122616) do
|
||||||
|
|
||||||
create_table "features", :force => true do |t|
|
|
||||||
t.string "name"
|
|
||||||
t.string "branch_name"
|
|
||||||
t.integer "assignee_id"
|
|
||||||
t.integer "author_id"
|
|
||||||
t.integer "project_id"
|
|
||||||
t.datetime "created_at"
|
|
||||||
t.datetime "updated_at"
|
|
||||||
t.string "version"
|
|
||||||
t.integer "status", :default => 0, :null => false
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "issues", :force => true do |t|
|
create_table "issues", :force => true do |t|
|
||||||
t.string "title"
|
t.string "title"
|
||||||
t.integer "assignee_id"
|
t.integer "assignee_id"
|
||||||
|
|
Loading…
Reference in a new issue