##// END OF EJS Templates
gists: fixed UI based on latest changes
dan -
r3762:fb960ee0 new-ui
parent child Browse files
Show More
@@ -2423,15 +2423,53 b' h3.files_location{'
2423 background-color: white;
2423 background-color: white;
2424 border-left: 1px solid #eeeeee;
2424 border-left: 1px solid #eeeeee;
2425 }
2425 }
2426
2426 // quick filter
2427
2427 .grid-quick-filter {
2428
2428 float: right;
2429
2429 position: relative;
2430
2430 }
2431
2431
2432
2432 .grid-filter-box {
2433
2433 display: flex;
2434
2434 padding: 0px;
2435 border-radius: 3px;
2436 margin-bottom: 0;
2437
2438 a {
2439 border: none !important;
2440 }
2441
2442 li {
2443 list-style-type: none
2444 }
2445 }
2446
2447 .grid-filter-box-icon {
2448 line-height: 33px;
2449 padding: 0;
2450 width: 20px;
2451 position: absolute;
2452 z-index: 11;
2453 left: 5px;
2454 }
2455
2456 .grid-filter-box-input {
2457 margin-right: 0;
2458
2459 input {
2460 border: 1px solid @white;
2461 padding-left: 25px;
2462 width: 145px;
2463
2464 &:hover {
2465 border-color: @grey6;
2466 }
2467
2468 &:focus {
2469 border-color: @grey5;
2470 }
2471 }
2472 }
2435
2473
2436
2474
2437
2475
@@ -14,19 +14,7 b''
14 %endif
14 %endif
15 </%def>
15 </%def>
16
16
17 <%def name="breadcrumbs_links()">
17 <%def name="breadcrumbs_links()"></%def>
18 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
19 %if c.show_private and not c.show_public:
20 ${_('Private Gists for user %s') % c.rhodecode_user.username}
21 %elif c.show_public and not c.show_private:
22 ${_('Public Gists for user %s') % c.rhodecode_user.username}
23 %elif c.show_public and c.show_private:
24 ${_('All Gists for user %s') % c.rhodecode_user.username}
25 %else:
26 ${_('All Public Gists')}
27 %endif
28 - <span id="gists_count">0</span>
29 </%def>
30
18
31 <%def name="menu_bar_nav()">
19 <%def name="menu_bar_nav()">
32 ${self.menu_items(active='gists')}
20 ${self.menu_items(active='gists')}
@@ -35,43 +23,52 b''
35
23
36
24
37 <%def name="main()">
25 <%def name="main()">
26
38 <div class="box">
27 <div class="box">
39 <div class="title">
28 <div class="title">
40 ${self.breadcrumbs(class_="breadcrumbs block-left")}
29
30 <ul class="button-links">
31 % if c.is_super_admin:
32 <li class="btn ${'active' if c.active=='all' else ''}"><a href="${h.route_path('gists_show', _query={'all': 1})}">${_('All gists')}</a></li>
33 %endif
34 <li class="btn ${'active' if c.active=='public' else ''}"><a href="${h.route_path('gists_show')}">${_('All public')}</a></li>
41 %if c.rhodecode_user.username != h.DEFAULT_USER:
35 %if c.rhodecode_user.username != h.DEFAULT_USER:
42 <ul class="links block-right">
36 <li class="btn ${'active' if c.active=='my_all' else ''}"><a href="${h.route_path('gists_show', _query={'public':1, 'private': 1})}">${_('My gists')}</a></li>
43 <li>
37 <li class="btn ${'active' if c.active=='my_private' else ''}"><a href="${h.route_path('gists_show', _query={'private': 1})}">${_('My private')}</a></li>
44 <a href="${h.route_path('gists_new')}" class="btn btn-primary">${_(u'Create New Gist')}</a>
38 <li class="btn ${'active' if c.active=='my_public' else ''}"><a href="${h.route_path('gists_show', _query={'public': 1})}">${_('My public')}</a></li>
45 </li>
46 </ul>
47 %endif
39 %endif
48 </div>
40 </ul>
49
50
41
51 <div class="sidebar-col-wrapper scw-small">
42 % if c.rhodecode_user.username != h.DEFAULT_USER:
52 ##main
43 <div class="pull-right">
53 <div class="sidebar">
44 <a class="btn btn-primary" href="${h.route_path('gists_new')}" >
54 <ul class="nav nav-pills nav-stacked">
45 ${_(u'Create New Gist')}
55 % if c.is_super_admin:
46 </a>
56 <li class="${'active' if c.active=='all' else ''}"><a href="${h.route_path('gists_show', _query={'all': 1})}">${_('All gists')}</a></li>
47 </div>
57 %endif
48 % endif
58 <li class="${'active' if c.active=='public' else ''}"><a href="${h.route_path('gists_show')}">${_('All public')}</a></li>
49
59 %if c.rhodecode_user.username != h.DEFAULT_USER:
50 <div class="grid-quick-filter">
60 <li class="${'active' if c.active=='my_all' else ''}"><a href="${h.route_path('gists_show', _query={'public':1, 'private': 1})}">${_('My gists')}</a></li>
51 <ul class="grid-filter-box">
61 <li class="${'active' if c.active=='my_private' else ''}"><a href="${h.route_path('gists_show', _query={'private': 1})}">${_('My private')}</a></li>
52 <li class="grid-filter-box-icon">
62 <li class="${'active' if c.active=='my_public' else ''}"><a href="${h.route_path('gists_show', _query={'public': 1})}">${_('My public')}</a></li>
53 <i class="icon-search"></i>
63 %endif
54 </li>
55 <li class="grid-filter-box-input">
56 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
57 </li>
64 </ul>
58 </ul>
65 </div>
59 </div>
66
60
67 <div class="main-content">
61 </div>
62
63 <div class="main-content-full-width">
68 <div id="repos_list_wrap">
64 <div id="repos_list_wrap">
69 <table id="gist_list_table" class="display"></table>
65 <table id="gist_list_table" class="display"></table>
70 </div>
66 </div>
71 </div>
67 </div>
72 </div>
68
73 </div>
69 </div>
74 <script>
70
71 <script type="text/javascript">
75 $(document).ready(function() {
72 $(document).ready(function() {
76
73
77 var get_datatable_count = function(){
74 var get_datatable_count = function(){
General Comments 0
You need to be logged in to leave comments. Login now