Show More
@@ -538,18 +538,14 b' div.header img {' | |||||
538 | background-repeat: repeat-x; |
|
538 | background-repeat: repeat-x; | |
539 | background-image: linear-gradient(to bottom, #577632, #577632); |
|
539 | background-image: linear-gradient(to bottom, #577632, #577632); | |
540 | margin: 0 0 20px; |
|
540 | margin: 0 0 20px; | |
541 | padding: 0; |
|
541 | padding: 10px 20px; | |
542 | border-radius: 4px 4px 0 0; |
|
542 | border-radius: 4px 4px 0 0; | |
543 | } |
|
543 | } | |
544 |
|
544 | |||
545 |
#content div.panel div.panel-heading |
|
545 | #content div.panel div.panel-heading a { | |
546 | color: #FFFFFF; |
|
546 | color: #FFFFFF; | |
547 | } |
|
547 | } | |
548 |
|
548 | |||
549 | #content div.panel div.panel-heading .link-white.current { |
|
|||
550 | color: #BFE3FF; |
|
|||
551 | } |
|
|||
552 |
|
||||
553 | #content div.panel div.panel-heading ul.links li { |
|
549 | #content div.panel div.panel-heading ul.links li { | |
554 | list-style: none; |
|
550 | list-style: none; | |
555 | float: left; |
|
551 | float: left; | |
@@ -561,7 +557,6 b' div.header img {' | |||||
561 | font-size: 13px; |
|
557 | font-size: 13px; | |
562 | font-weight: 700; |
|
558 | font-weight: 700; | |
563 | height: 1%; |
|
559 | height: 1%; | |
564 | margin: 4px; |
|
|||
565 | text-decoration: none; |
|
560 | text-decoration: none; | |
566 | } |
|
561 | } | |
567 |
|
562 | |||
@@ -572,14 +567,6 b' div.header img {' | |||||
572 | padding: 11px 10px 11px 10px; |
|
567 | padding: 11px 10px 11px 10px; | |
573 | } |
|
568 | } | |
574 |
|
569 | |||
575 | #content div.panel div.panel-heading .links.icon-only-links a { |
|
|||
576 | float: left; |
|
|||
577 | color: #fff; |
|
|||
578 | margin: 0; |
|
|||
579 | padding: 0 10px; |
|
|||
580 | line-height: 18px; |
|
|||
581 | } |
|
|||
582 |
|
||||
583 | .clearfix::before, .clearfix::after, .dl-horizontal dd::before, .dl-horizontal dd::after, .container::before, .container::after, .container-fluid::before, .container-fluid::after, .row::before, .row::after, .form-horizontal .form-group::before, .form-horizontal .form-group::after, .btn-toolbar::before, .btn-toolbar::after, .btn-group-vertical > .btn-group::before, .btn-group-vertical > .btn-group::after, .nav::before, .nav::after, .navbar::before, .navbar::after, .navbar-header::before, .navbar-header::after, .navbar-collapse::before, .navbar-collapse::after, .pager::before, .pager::after, .panel::before, .panel::after, .panel-body::before, .panel-body::after, .modal-header::before, .modal-header::after, .modal-footer::before, .modal-footer::after, td.inline-comments::before, td.inline-comments::after { |
|
570 | .clearfix::before, .clearfix::after, .dl-horizontal dd::before, .dl-horizontal dd::after, .container::before, .container::after, .container-fluid::before, .container-fluid::after, .row::before, .row::after, .form-horizontal .form-group::before, .form-horizontal .form-group::after, .btn-toolbar::before, .btn-toolbar::after, .btn-group-vertical > .btn-group::before, .btn-group-vertical > .btn-group::after, .nav::before, .nav::after, .navbar::before, .navbar::after, .navbar-header::before, .navbar-header::after, .navbar-collapse::before, .navbar-collapse::after, .pager::before, .pager::after, .panel::before, .panel::after, .panel-body::before, .panel-body::after, .modal-header::before, .modal-header::after, .modal-footer::before, .modal-footer::after, td.inline-comments::before, td.inline-comments::after { | |
584 | content: " "; |
|
571 | content: " "; | |
585 | display: table; |
|
572 | display: table; | |
@@ -604,13 +591,10 b' div.header img {' | |||||
604 | float: right; |
|
591 | float: right; | |
605 | } |
|
592 | } | |
606 |
|
593 | |||
607 |
#content div.panel div.panel-heading .pull-left |
|
594 | #content div.panel div.panel-heading .pull-left, | |
608 | margin: 10px; |
|
595 | #content div.panel div.panel-heading .pull-left a, | |
609 | color: white; |
|
596 | #content div.panel div.panel-heading .pull-right, | |
610 | } |
|
597 | #content div.panel div.panel-heading .pull-right a { | |
611 |
|
||||
612 | #content div.panel div.panel-heading .pull-right { |
|
|||
613 | margin: 5px; |
|
|||
614 | color: white; |
|
598 | color: white; | |
615 | } |
|
599 | } | |
616 |
|
600 | |||
@@ -628,14 +612,10 b' div.header img {' | |||||
628 | #content div.panel div.h6 { |
|
612 | #content div.panel div.h6 { | |
629 | clear: both; |
|
613 | clear: both; | |
630 | overflow: hidden; |
|
614 | overflow: hidden; | |
631 |
margin: 8px |
|
615 | margin: 8px 0 3px; | |
632 | padding-bottom: 2px; |
|
616 | padding-bottom: 2px; | |
633 | } |
|
617 | } | |
634 |
|
618 | |||
635 | #content div.panel div.normal-indent { |
|
|||
636 | margin: 0 20px 10px 20px; |
|
|||
637 | } |
|
|||
638 |
|
||||
639 | #content div.panel p { |
|
619 | #content div.panel p { | |
640 | color: #5f5f5f; |
|
620 | color: #5f5f5f; | |
641 | font-size: 12px; |
|
621 | font-size: 12px; | |
@@ -1176,6 +1156,10 b' div.form div.form-horizontal div.form-gr' | |||||
1176 | padding: 0 3px 2px; |
|
1156 | padding: 0 3px 2px; | |
1177 | } |
|
1157 | } | |
1178 |
|
1158 | |||
|
1159 | #content div.panel #summary-panel-body { | |||
|
1160 | position: relative; | |||
|
1161 | } | |||
|
1162 | ||||
1179 | #content div.panel #summary { |
|
1163 | #content div.panel #summary { | |
1180 | margin-right: 200px; |
|
1164 | margin-right: 200px; | |
1181 | min-height: 240px; |
|
1165 | min-height: 240px; | |
@@ -1190,7 +1174,6 b' div.form div.form-horizontal div.form-gr' | |||||
1190 | } |
|
1174 | } | |
1191 |
|
1175 | |||
1192 | #summary-menu-stats ul { |
|
1176 | #summary-menu-stats ul { | |
1193 | margin: 0 10px; |
|
|||
1194 | display: block; |
|
1177 | display: block; | |
1195 | background-color: #f9f9f9; |
|
1178 | background-color: #f9f9f9; | |
1196 | border: 1px solid #d1d1d1; |
|
1179 | border: 1px solid #d1d1d1; | |
@@ -1322,7 +1305,7 b' a.metatag[data-tag="license"]:hover {' | |||||
1322 | overflow: hidden; |
|
1305 | overflow: hidden; | |
1323 | text-align: right; |
|
1306 | text-align: right; | |
1324 | margin: 0; |
|
1307 | margin: 0; | |
1325 |
padding: |
|
1308 | padding: 10px 20px; | |
1326 | margin: -10px 0 0; |
|
1309 | margin: -10px 0 0; | |
1327 | background-color: #577632; |
|
1310 | background-color: #577632; | |
1328 | background-repeat: repeat-x; |
|
1311 | background-repeat: repeat-x; | |
@@ -1332,7 +1315,6 b' a.metatag[data-tag="license"]:hover {' | |||||
1332 | } |
|
1315 | } | |
1333 |
|
1316 | |||
1334 | #footer > span { |
|
1317 | #footer > span { | |
1335 | padding: 15px 25px 15px 0; |
|
|||
1336 | color: #FFF; |
|
1318 | color: #FFF; | |
1337 | font-weight: 700; |
|
1319 | font-weight: 700; | |
1338 | } |
|
1320 | } | |
@@ -1630,6 +1612,10 b' a.metatag[data-tag="license"]:hover {' | |||||
1630 | padding-bottom: 4px; |
|
1612 | padding-bottom: 4px; | |
1631 | } |
|
1613 | } | |
1632 |
|
1614 | |||
|
1615 | #journal { | |||
|
1616 | margin-left: 20px; | |||
|
1617 | } | |||
|
1618 | ||||
1633 | #journal .journal_day { |
|
1619 | #journal .journal_day { | |
1634 | font-size: 20px; |
|
1620 | font-size: 20px; | |
1635 | padding: 10px 0px; |
|
1621 | padding: 10px 0px; | |
@@ -1639,13 +1625,11 b' a.metatag[data-tag="license"]:hover {' | |||||
1639 | } |
|
1625 | } | |
1640 |
|
1626 | |||
1641 | #journal .journal_container { |
|
1627 | #journal .journal_container { | |
1642 | padding: 5px; |
|
|||
1643 | clear: both; |
|
1628 | clear: both; | |
1644 | margin: 0px 5px 0px 10px; |
|
|||
1645 | } |
|
1629 | } | |
1646 |
|
1630 | |||
1647 | #journal .journal_action_container { |
|
1631 | #journal .journal_action_container { | |
1648 |
padding-left: |
|
1632 | padding-left: 18px; | |
1649 | } |
|
1633 | } | |
1650 |
|
1634 | |||
1651 | #journal .journal_user { |
|
1635 | #journal .journal_user { | |
@@ -2791,14 +2775,8 b" table.code-browser i[class^='icon-'] {" | |||||
2791 | .breadcrumbs { |
|
2775 | .breadcrumbs { | |
2792 | border: medium none; |
|
2776 | border: medium none; | |
2793 | color: #FFF; |
|
2777 | color: #FFF; | |
2794 | float: left; |
|
|||
2795 | font-weight: 700; |
|
2778 | font-weight: 700; | |
2796 | font-size: 14px; |
|
2779 | font-size: 14px; | |
2797 | margin: 10px; |
|
|||
2798 | } |
|
|||
2799 |
|
||||
2800 | .pull-left .breadcrumbs { |
|
|||
2801 | margin: 0; |
|
|||
2802 | } |
|
2780 | } | |
2803 |
|
2781 | |||
2804 | .breadcrumbs .hash { |
|
2782 | .breadcrumbs .hash { | |
@@ -2806,10 +2784,6 b" table.code-browser i[class^='icon-'] {" | |||||
2806 | color: #fff; |
|
2784 | color: #fff; | |
2807 | } |
|
2785 | } | |
2808 |
|
2786 | |||
2809 | .breadcrumbs a { |
|
|||
2810 | color: #FFF; |
|
|||
2811 | } |
|
|||
2812 |
|
||||
2813 | .flash_msg { |
|
2787 | .flash_msg { | |
2814 | } |
|
2788 | } | |
2815 |
|
2789 | |||
@@ -2913,6 +2887,7 b' table#permissions_manage tr#add_perm_inp' | |||||
2913 | } |
|
2887 | } | |
2914 |
|
2888 | |||
2915 | div.gravatar { |
|
2889 | div.gravatar { | |
|
2890 | float: left; | |||
2916 | background-color: #FFF; |
|
2891 | background-color: #FFF; | |
2917 | margin-right: 0.7em; |
|
2892 | margin-right: 0.7em; | |
2918 | padding: 1px 1px 1px 1px; |
|
2893 | padding: 1px 1px 1px 1px; | |
@@ -2947,7 +2922,7 b' div.gravatar img {' | |||||
2947 |
|
2922 | |||
2948 | .label, |
|
2923 | .label, | |
2949 | .btn { |
|
2924 | .btn { | |
2950 | color: #515151; |
|
2925 | color: #515151 !important; | |
2951 | background-color: #DADADA; |
|
2926 | background-color: #DADADA; | |
2952 | background-repeat: repeat-x; |
|
2927 | background-repeat: repeat-x; | |
2953 | background-image: linear-gradient(to bottom, #F4F4F4, #DADADA); |
|
2928 | background-image: linear-gradient(to bottom, #F4F4F4, #DADADA); | |
@@ -2957,7 +2932,7 b' div.gravatar img {' | |||||
2957 | border-right: 1px solid #DDD; |
|
2932 | border-right: 1px solid #DDD; | |
2958 | border-bottom: 1px solid #c6c6c6; |
|
2933 | border-bottom: 1px solid #c6c6c6; | |
2959 | outline: none; |
|
2934 | outline: none; | |
2960 |
margin: 0 |
|
2935 | margin: 0 3px 0 0; | |
2961 | border-radius: 4px 4px 4px 4px !important; |
|
2936 | border-radius: 4px 4px 4px 4px !important; | |
2962 | padding: 3px 3px 3px 3px; |
|
2937 | padding: 3px 3px 3px 3px; | |
2963 | display: inline-block; |
|
2938 | display: inline-block; | |
@@ -2970,20 +2945,35 b' div.gravatar img {' | |||||
2970 | cursor: default !important; |
|
2945 | cursor: default !important; | |
2971 | } |
|
2946 | } | |
2972 |
|
2947 | |||
2973 | ul.nav-stacked { |
|
2948 | .panel-body.settings > ul.nav-stacked { | |
|
2949 | float: left; | |||
|
2950 | width: 150px; | |||
2974 | margin: 20px; |
|
2951 | margin: 20px; | |
2975 | color: #393939; |
|
2952 | color: #393939; | |
2976 | font-weight: 700; |
|
2953 | font-weight: 700; | |
2977 | } |
|
2954 | } | |
2978 |
|
2955 | |||
2979 | ul.nav-stacked a { |
|
2956 | .panel-body.settings > ul.nav-stacked a { | |
2980 | color: inherit; |
|
2957 | color: inherit; | |
2981 | } |
|
2958 | } | |
2982 |
|
2959 | |||
2983 | ul.nav-stacked li.active { |
|
2960 | .panel-body.settings > ul.nav-stacked li.active { | |
2984 | list-style-type: disc |
|
2961 | list-style-type: disc | |
2985 | } |
|
2962 | } | |
2986 |
|
2963 | |||
|
2964 | .panel-body.settings > div, | |||
|
2965 | .panel-body.settings > form { | |||
|
2966 | float: left; | |||
|
2967 | width: 750px; | |||
|
2968 | margin: 10px 0 0 0; | |||
|
2969 | border-left: 1px solid #DDDDDD; | |||
|
2970 | } | |||
|
2971 | ||||
|
2972 | .panel-body > div, | |||
|
2973 | .panel-body > form { | |||
|
2974 | padding: 0 20px 10px; | |||
|
2975 | } | |||
|
2976 | ||||
2987 | /* make .btn inputs and buttons and divs look the same */ |
|
2977 | /* make .btn inputs and buttons and divs look the same */ | |
2988 | button.btn, |
|
2978 | button.btn, | |
2989 | input.btn { |
|
2979 | input.btn { | |
@@ -3035,7 +3025,7 b' input[disabled].btn,' | |||||
3035 |
|
3025 | |||
3036 | .label.label-danger, |
|
3026 | .label.label-danger, | |
3037 | .btn.btn-danger { |
|
3027 | .btn.btn-danger { | |
3038 | color: #fff; |
|
3028 | color: #fff !important; | |
3039 | background-color: #c43c35; |
|
3029 | background-color: #c43c35; | |
3040 | background-repeat: repeat-x; |
|
3030 | background-repeat: repeat-x; | |
3041 | background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); |
|
3031 | background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); | |
@@ -3045,7 +3035,7 b' input[disabled].btn,' | |||||
3045 |
|
3035 | |||
3046 | .label.label-primary, |
|
3036 | .label.label-primary, | |
3047 | .btn.btn-primary { |
|
3037 | .btn.btn-primary { | |
3048 | color: #fff; |
|
3038 | color: #fff !important; | |
3049 | background-color: #339bb9; |
|
3039 | background-color: #339bb9; | |
3050 | background-repeat: repeat-x; |
|
3040 | background-repeat: repeat-x; | |
3051 | background-image: linear-gradient(to bottom, #5bc0de, #339bb9); |
|
3041 | background-image: linear-gradient(to bottom, #5bc0de, #339bb9); | |
@@ -3055,7 +3045,7 b' input[disabled].btn,' | |||||
3055 |
|
3045 | |||
3056 | .label.label-success, |
|
3046 | .label.label-success, | |
3057 | .btn.btn-success { |
|
3047 | .btn.btn-success { | |
3058 | color: #fff; |
|
3048 | color: #fff !important; | |
3059 | background-color: #57a957; |
|
3049 | background-color: #57a957; | |
3060 | background-repeat: repeat-x; |
|
3050 | background-repeat: repeat-x; | |
3061 | background-image: linear-gradient(to bottom, #62c462, #57a957); |
|
3051 | background-image: linear-gradient(to bottom, #62c462, #57a957); | |
@@ -3065,7 +3055,7 b' input[disabled].btn,' | |||||
3065 |
|
3055 | |||
3066 | .label.label-warning, |
|
3056 | .label.label-warning, | |
3067 | .btn.btn-warning { |
|
3057 | .btn.btn-warning { | |
3068 | color: #fff; |
|
3058 | color: #fff !important; | |
3069 | background-color: #faa732; |
|
3059 | background-color: #faa732; | |
3070 | background-repeat: repeat-x; |
|
3060 | background-repeat: repeat-x; | |
3071 | background-image: linear-gradient(to bottom, #fbb450, #f89406); |
|
3061 | background-image: linear-gradient(to bottom, #fbb450, #f89406); | |
@@ -3074,7 +3064,7 b' input[disabled].btn,' | |||||
3074 | } |
|
3064 | } | |
3075 |
|
3065 | |||
3076 | label.disabled { |
|
3066 | label.disabled { | |
3077 | color: #aaa; |
|
3067 | color: #aaa !important; | |
3078 | } |
|
3068 | } | |
3079 |
|
3069 | |||
3080 | .btn.active { |
|
3070 | .btn.active { | |
@@ -3206,26 +3196,6 b' div#legend_data, div#legend_container, d' | |||||
3206 | margin: 10px 24px 10px 44px; |
|
3196 | margin: 10px 24px 10px 44px; | |
3207 | } |
|
3197 | } | |
3208 |
|
3198 | |||
3209 | #content div.panel div.form, |
|
|||
3210 | #content div.panel div.panel-body, |
|
|||
3211 | #content div.panel div.traffic { |
|
|||
3212 | position: relative; |
|
|||
3213 | clear: both; |
|
|||
3214 | margin: 0; |
|
|||
3215 | padding: 0 20px 10px; |
|
|||
3216 | } |
|
|||
3217 |
|
||||
3218 | #content div.panel div.form div.form-horizontal, |
|
|||
3219 | #login div.form-horizontal, |
|
|||
3220 | #login div.form-horizontal div.form-group, |
|
|||
3221 | #register div.form, |
|
|||
3222 | #register div.form div.form-horizontal { |
|
|||
3223 | clear: both; |
|
|||
3224 | overflow: hidden; |
|
|||
3225 | margin: 0; |
|
|||
3226 | padding: 0; |
|
|||
3227 | } |
|
|||
3228 |
|
||||
3229 | #content div.panel div.form div.form-horizontal div.form-group > div input.error, |
|
3199 | #content div.panel div.form div.form-horizontal div.form-group > div input.error, | |
3230 | #login div.form div.form-horizontal div.form-group > div input.error, |
|
3200 | #login div.form div.form-horizontal div.form-group > div input.error, | |
3231 | #register div.form div.form-horizontal div.form-group > div input.error { |
|
3201 | #register div.form div.form-horizontal div.form-group > div input.error { | |
@@ -3440,10 +3410,6 b' div#legend_choices table td {' | |||||
3440 | padding: 0px 0px 0px 10px; |
|
3410 | padding: 0px 0px 0px 10px; | |
3441 | } |
|
3411 | } | |
3442 |
|
3412 | |||
3443 | .emails_wrap { |
|
|||
3444 | padding: 0px 20px; |
|
|||
3445 | } |
|
|||
3446 |
|
||||
3447 | .emails_wrap .email_entry { |
|
3413 | .emails_wrap .email_entry { | |
3448 | height: 30px; |
|
3414 | height: 30px; | |
3449 | padding: 0px 0px 0px 10px; |
|
3415 | padding: 0px 0px 0px 10px; | |
@@ -3455,10 +3421,6 b' div#legend_choices table td {' | |||||
3455 | float: left |
|
3421 | float: left | |
3456 | } |
|
3422 | } | |
3457 |
|
3423 | |||
3458 | .ips_wrap { |
|
|||
3459 | padding: 0px 20px; |
|
|||
3460 | } |
|
|||
3461 |
|
||||
3462 | .ips_wrap .ip_entry { |
|
3424 | .ips_wrap .ip_entry { | |
3463 | height: 30px; |
|
3425 | height: 30px; | |
3464 | padding: 0px 0px 0px 10px; |
|
3426 | padding: 0px 0px 0px 10px; | |
@@ -3920,12 +3882,6 b' input.status_change_radio {' | |||||
3920 | font-weight: bold; |
|
3882 | font-weight: bold; | |
3921 | font-size: 17px; |
|
3883 | font-size: 17px; | |
3922 | } |
|
3884 | } | |
3923 | .notification-table { |
|
|||
3924 | border: 1px solid #ccc; |
|
|||
3925 | border-radius: 6px 6px 6px 6px; |
|
|||
3926 | clear: both; |
|
|||
3927 | margin: 0px 20px 0px 20px; |
|
|||
3928 | } |
|
|||
3929 | .notification-header .delete-notifications { |
|
3885 | .notification-header .delete-notifications { | |
3930 | float: right; |
|
3886 | float: right; | |
3931 | padding-top: 8px; |
|
3887 | padding-top: 8px; | |
@@ -3939,7 +3895,7 b' input.status_change_radio {' | |||||
3939 | .notification-subject { |
|
3895 | .notification-subject { | |
3940 | clear: both; |
|
3896 | clear: both; | |
3941 | border-bottom: 1px solid #eee; |
|
3897 | border-bottom: 1px solid #eee; | |
3942 |
padding: 5px 0px |
|
3898 | padding: 5px 0px; | |
3943 | } |
|
3899 | } | |
3944 |
|
3900 | |||
3945 | .notification-body { |
|
3901 | .notification-body { | |
@@ -4014,7 +3970,13 b' span.pr-closed-tag {' | |||||
4014 | text-transform: capitalize; |
|
3970 | text-transform: capitalize; | |
4015 | } |
|
3971 | } | |
4016 |
|
3972 | |||
|
3973 | #perms .perms_section_head label { | |||
|
3974 | margin-left: 10px; | |||
|
3975 | } | |||
|
3976 | ||||
4017 | #perms .perm_tag { |
|
3977 | #perms .perm_tag { | |
|
3978 | position: relative; | |||
|
3979 | top: -2px; | |||
4018 | padding: 3px 3px 1px 3px; |
|
3980 | padding: 3px 3px 1px 3px; | |
4019 | font-size: 10px; |
|
3981 | font-size: 10px; | |
4020 | font-weight: bold; |
|
3982 | font-weight: bold; | |
@@ -4043,6 +4005,11 b' span.pr-closed-tag {' | |||||
4043 | color: #ffffff; |
|
4005 | color: #ffffff; | |
4044 | } |
|
4006 | } | |
4045 |
|
4007 | |||
|
4008 | input.perm_filter { | |||
|
4009 | position: relative; | |||
|
4010 | top: 2px; | |||
|
4011 | } | |||
|
4012 | ||||
4046 | .perm-gravatar { |
|
4013 | .perm-gravatar { | |
4047 | vertical-align: middle; |
|
4014 | vertical-align: middle; | |
4048 | padding: 2px; |
|
4015 | padding: 2px; | |
@@ -4095,9 +4062,7 b' div.diffblock {' | |||||
4095 | line-height: 125%; |
|
4062 | line-height: 125%; | |
4096 | border-radius: 6px 6px 0px 0px; |
|
4063 | border-radius: 6px 6px 0px 0px; | |
4097 | } |
|
4064 | } | |
4098 | div.diffblock.margined { |
|
4065 | ||
4099 | margin: 0px 20px 0px 20px; |
|
|||
4100 | } |
|
|||
4101 | .compare-revision-selector, |
|
4066 | .compare-revision-selector, | |
4102 | div.diffblock .code-header { |
|
4067 | div.diffblock .code-header { | |
4103 | border-bottom: 1px solid #CCCCCC; |
|
4068 | border-bottom: 1px solid #CCCCCC; | |
@@ -4397,15 +4362,6 b' div.comment-prev-next-links div.next-com' | |||||
4397 | margin: 3px 6px; |
|
4362 | margin: 3px 6px; | |
4398 | } |
|
4363 | } | |
4399 |
|
4364 | |||
4400 | #help_kb { |
|
|||
4401 | display: none; |
|
|||
4402 | } |
|
|||
4403 |
|
||||
4404 | .icon-only-links i { |
|
|||
4405 | color: white; |
|
|||
4406 | } |
|
|||
4407 |
|
||||
4408 |
|
||||
4409 | body table.dataTable thead .sorting { |
|
4365 | body table.dataTable thead .sorting { | |
4410 | background-image: none; |
|
4366 | background-image: none; | |
4411 | } |
|
4367 | } | |
@@ -4472,3 +4428,12 b' body table.dataTable thead .sorting_desc' | |||||
4472 | .text-nowrap { |
|
4428 | .text-nowrap { | |
4473 | white-space: nowrap; |
|
4429 | white-space: nowrap; | |
4474 | } |
|
4430 | } | |
|
4431 | ||||
|
4432 | div.codeblock div.code-header div.author { | |||
|
4433 | height: auto; | |||
|
4434 | min-height: 25px; | |||
|
4435 | } | |||
|
4436 | ||||
|
4437 | ul.user_group_member li { | |||
|
4438 | clear: both; | |||
|
4439 | } |
@@ -12,10 +12,11 b'' | |||||
12 | <%def name="main()"> |
|
12 | <%def name="main()"> | |
13 |
|
13 | |||
14 | <div class="panel panel-primary"> |
|
14 | <div class="panel panel-primary"> | |
15 |
<div class="panel-heading |
|
15 | <div class="panel-heading"> | |
16 | <h5>${_('About')} Kallithea</h5> |
|
16 | <h5 class="panel-title">${_('About')} Kallithea</h5> | |
17 | </div> |
|
17 | </div> | |
18 |
|
18 | |||
|
19 | <div class="panel-body"> | |||
19 | <p><a href="https://kallithea-scm.org/">Kallithea</a> is a project of the |
|
20 | <p><a href="https://kallithea-scm.org/">Kallithea</a> is a project of the | |
20 | <a href="http://sfconservancy.org/">Software Freedom Conservancy, Inc.</a> |
|
21 | <a href="http://sfconservancy.org/">Software Freedom Conservancy, Inc.</a> | |
21 | and is released under the terms of the |
|
22 | and is released under the terms of the | |
@@ -143,15 +144,16 b'' | |||||
143 | ## Stefan Engel <mail@engel-stefan.de> in 2012 |
|
144 | ## Stefan Engel <mail@engel-stefan.de> in 2012 | |
144 | ## Ton Plomp <tcplomp@gmail.com> in 2013 |
|
145 | ## Ton Plomp <tcplomp@gmail.com> in 2013 | |
145 | ## |
|
146 | ## | |
146 | </ul></p> |
|
147 | </ul></p> | |
147 |
|
148 | |||
148 | <p>The above are the copyright holders who have submitted direct |
|
149 | <p>The above are the copyright holders who have submitted direct | |
149 | contributions to the Kallithea repository. In |
|
150 | contributions to the Kallithea repository. In | |
150 | the <a href="https://kallithea-scm.org/repos/kallithea">Kallithea source |
|
151 | the <a href="https://kallithea-scm.org/repos/kallithea">Kallithea source | |
151 | code</a>, there is |
|
152 | code</a>, there is | |
152 | a <a href="https://kallithea-scm.org/repos/kallithea/files/tip/LICENSE.md">list |
|
153 | a <a href="https://kallithea-scm.org/repos/kallithea/files/tip/LICENSE.md">list | |
153 | of third-party libraries and code that Kallithea incorporates</a>.</p> |
|
154 | of third-party libraries and code that Kallithea incorporates</a>.</p> | |
154 |
|
155 | |||
|
156 | </div> | |||
155 | </div> |
|
157 | </div> | |
156 |
|
158 | |||
157 | </%def> |
|
159 | </%def> |
@@ -20,8 +20,8 b'' | |||||
20 | <div class="panel-heading clearfix"> |
|
20 | <div class="panel-heading clearfix"> | |
21 | ${self.breadcrumbs()} |
|
21 | ${self.breadcrumbs()} | |
22 | </div> |
|
22 | </div> | |
|
23 | <div class="form panel-body settings"> | |||
23 | ${h.form(url('auth_settings'))} |
|
24 | ${h.form(url('auth_settings'))} | |
24 | <div class="form"> |
|
|||
25 |
|
25 | |||
26 | ## enabled auth plugins |
|
26 | ## enabled auth plugins | |
27 | <h1>${_('Authentication Plugins')}</h1> |
|
27 | <h1>${_('Authentication Plugins')}</h1> | |
@@ -107,8 +107,8 b'' | |||||
107 | </div> |
|
107 | </div> | |
108 | </div> |
|
108 | </div> | |
109 | </div> |
|
109 | </div> | |
|
110 | ${h.end_form()} | |||
110 | </div> |
|
111 | </div> | |
111 | ${h.end_form()} |
|
|||
112 | </div> |
|
112 | </div> | |
113 |
|
113 | |||
114 | <script> |
|
114 | <script> |
@@ -22,7 +22,7 b'' | |||||
22 | </div> |
|
22 | </div> | |
23 |
|
23 | |||
24 | ${h.form(url('defaults_update', id='defaults'))} |
|
24 | ${h.form(url('defaults_update', id='defaults'))} | |
25 | <div class="form"> |
|
25 | <div class="form panel-body settings"> | |
26 | <div class="form-horizontal"> |
|
26 | <div class="form-horizontal"> | |
27 |
|
27 | |||
28 | <div class="form-group"> |
|
28 | <div class="form-group"> |
@@ -50,7 +50,7 b'' | |||||
50 | <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" |
|
50 | <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" | |
51 | id="description" name="description" |
|
51 | id="description" name="description" | |
52 | placeholder="${_('Gist description ...')}">${c.gist.gist_description}</textarea> |
|
52 | placeholder="${_('Gist description ...')}">${c.gist.gist_description}</textarea> | |
53 | <div style="padding:0px 0px 0px 42px"> |
|
53 | <div> | |
54 | <label> |
|
54 | <label> | |
55 | ${_('Gist lifetime')} |
|
55 | ${_('Gist lifetime')} | |
56 | ${h.select('lifetime', '0', c.lifetime_options)} |
|
56 | ${h.select('lifetime', '0', c.lifetime_options)} |
@@ -38,10 +38,10 b'' | |||||
38 | </div> |
|
38 | </div> | |
39 | %endif |
|
39 | %endif | |
40 | </div> |
|
40 | </div> | |
41 | %if c.gists_pager.item_count>0: |
|
41 | <div class="panel-body"> | |
|
42 | %if c.gists_pager.item_count>0: | |||
42 | % for gist in c.gists_pager: |
|
43 | % for gist in c.gists_pager: | |
43 | <div class="gist-item" style="padding:10px 20px 10px 15px"> |
|
44 | <div class="gist-item clearfix" style="padding:10px 20px 10px 15px"> | |
44 |
|
||||
45 | ${h.gravatar_div(gist.owner.email, size=28)} |
|
45 | ${h.gravatar_div(gist.owner.email, size=28)} | |
46 | <div title="${gist.owner.full_contact}" class="user" style="font-size: 16px"> |
|
46 | <div title="${gist.owner.full_contact}" class="user" style="font-size: 16px"> | |
47 | <b>${h.person(gist.owner.full_contact)}</b> / |
|
47 | <b>${h.person(gist.owner.full_contact)}</b> / | |
@@ -65,8 +65,9 b'' | |||||
65 | <ul class="pagination"> |
|
65 | <ul class="pagination"> | |
66 | ${c.gists_pager.pager(**request.GET.mixed())} |
|
66 | ${c.gists_pager.pager(**request.GET.mixed())} | |
67 | </ul> |
|
67 | </ul> | |
68 | %else: |
|
68 | %else: | |
69 | <div>${_('There are no gists yet')}</div> |
|
69 | <div>${_('There are no gists yet')}</div> | |
70 | %endif |
|
70 | %endif | |
|
71 | </div> | |||
71 | </div> |
|
72 | </div> | |
72 | </%def> |
|
73 | </%def> |
@@ -34,7 +34,7 b'' | |||||
34 | <div> |
|
34 | <div> | |
35 | ${h.gravatar_div(c.authuser.email, size=32)} |
|
35 | ${h.gravatar_div(c.authuser.email, size=32)} | |
36 | <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea> |
|
36 | <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea> | |
37 | <div style="padding:0px 0px 0px 42px"> |
|
37 | <div> | |
38 | <label> |
|
38 | <label> | |
39 | ${_('Gist lifetime')} |
|
39 | ${_('Gist lifetime')} | |
40 | ${h.select('lifetime', '', c.lifetime_options)} |
|
40 | ${h.select('lifetime', '', c.lifetime_options)} |
@@ -14,13 +14,13 b'' | |||||
14 | </%block> |
|
14 | </%block> | |
15 |
|
15 | |||
16 | <%def name="main()"> |
|
16 | <%def name="main()"> | |
17 |
<div class="panel panel-primary" |
|
17 | <div class="panel panel-primary"> | |
18 |
<div class="panel-heading |
|
18 | <div class="panel-heading"> | |
19 | ${self.breadcrumbs()} |
|
19 | ${self.breadcrumbs()} | |
20 | </div> |
|
20 | </div> | |
21 |
|
21 | |||
22 | ##main |
|
22 | ##main | |
23 | <div style="width: 150px; float:left"> |
|
23 | <div class="panel-body settings"> | |
24 | <ul class="nav nav-pills nav-stacked"> |
|
24 | <ul class="nav nav-pills nav-stacked"> | |
25 | <li> |
|
25 | <li> | |
26 | <div class="gravatar_box" style="height: 26px"> |
|
26 | <div class="gravatar_box" style="height: 26px"> | |
@@ -38,10 +38,10 b'' | |||||
38 | <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched Repositories')}</a></li> |
|
38 | <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched Repositories')}</a></li> | |
39 | <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('Show Permissions')}</a></li> |
|
39 | <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('Show Permissions')}</a></li> | |
40 | </ul> |
|
40 | </ul> | |
41 | </div> |
|
|||
42 |
|
41 | |||
43 | <div style="min-width:750px; float:left; padding: 10px 0px 0px 20px;margin: 0px 0px 0px 10px; border-left: 1px solid #DDDDDD"> |
|
42 | <div> | |
44 | <%include file="/admin/my_account/my_account_${c.active}.html"/> |
|
43 | <%include file="/admin/my_account/my_account_${c.active}.html"/> | |
|
44 | </div> | |||
45 | </div> |
|
45 | </div> | |
46 | </div> |
|
46 | </div> | |
47 |
|
47 |
@@ -1,5 +1,4 b'' | |||||
1 | <div class="apikeys_wrap"> |
|
1 | <table class="table"> | |
2 | <table class="table"> |
|
|||
3 | <tr> |
|
2 | <tr> | |
4 | <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td> |
|
3 | <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td> | |
5 | <td> |
|
4 | <td> | |
@@ -48,8 +47,7 b'' | |||||
48 | %else: |
|
47 | %else: | |
49 | <tr><td><div class="ip">${_('No additional API keys specified')}</div></td></tr> |
|
48 | <tr><td><div class="ip">${_('No additional API keys specified')}</div></td></tr> | |
50 | %endif |
|
49 | %endif | |
51 |
|
|
50 | </table> | |
52 | </div> |
|
|||
53 |
|
51 | |||
54 | <div> |
|
52 | <div> | |
55 | ${h.form(url('my_account_api_keys'), method='post')} |
|
53 | ${h.form(url('my_account_api_keys'), method='post')} |
@@ -19,15 +19,17 b'' | |||||
19 | ${self.breadcrumbs()} |
|
19 | ${self.breadcrumbs()} | |
20 | </div> |
|
20 | </div> | |
21 |
|
21 | |||
22 |
<div class="p |
|
22 | <div class="panel-body"> | |
|
23 | <div class="pull-left"> | |||
23 | <span id='all' class="btn btn-default btn-sm"><a href="${h.url.current()}">${_('All')}</a></span> |
|
24 | <span id='all' class="btn btn-default btn-sm"><a href="${h.url.current()}">${_('All')}</a></span> | |
24 | <span id='comment' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span> |
|
25 | <span id='comment' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span> | |
25 | <span id='pull_request' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span> |
|
26 | <span id='pull_request' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span> | |
26 | </div> |
|
27 | </div> | |
27 | %if c.notifications: |
|
28 | %if c.notifications: | |
28 | <span id='mark_all_read' class="btn btn-default btn-sm pull-right">${_('Mark All Read')}</span> |
|
29 | <span id='mark_all_read' class="btn btn-default btn-sm pull-right">${_('Mark All Read')}</span> | |
29 | %endif |
|
30 | %endif | |
30 | <div id="notification_data"> |
|
31 | </div> | |
|
32 | <div id="notification_data" class="panel-body"> | |||
31 | <%include file='notifications_data.html'/> |
|
33 | <%include file='notifications_data.html'/> | |
32 | </div> |
|
34 | </div> | |
33 | </div> |
|
35 | </div> |
@@ -17,22 +17,22 b'' | |||||
17 |
|
17 | |||
18 |
|
18 | |||
19 | <%def name="main()"> |
|
19 | <%def name="main()"> | |
20 |
<div class="panel panel-primary" |
|
20 | <div class="panel panel-primary"> | |
21 | <div class="panel-heading clearfix"> |
|
21 | <div class="panel-heading clearfix"> | |
22 | ${self.breadcrumbs()} |
|
22 | ${self.breadcrumbs()} | |
23 | </div> |
|
23 | </div> | |
24 |
|
24 | |||
25 | ##main |
|
25 | ##main | |
26 | <div style="width: 150px; float:left"> |
|
26 | <div class="panel-body settings"> | |
27 | <ul class="nav nav-pills nav-stacked"> |
|
27 | <ul class="nav nav-pills nav-stacked"> | |
28 | <li class="${'active' if c.active=='globals' else ''}"><a href="${h.url('admin_permissions')}">${_('Global')}</a></li> |
|
28 | <li class="${'active' if c.active=='globals' else ''}"><a href="${h.url('admin_permissions')}">${_('Global')}</a></li> | |
29 | <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('admin_permissions_ips')}">${_('IP Whitelist')}</a></li> |
|
29 | <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('admin_permissions_ips')}">${_('IP Whitelist')}</a></li> | |
30 | <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('admin_permissions_perms')}">${_('Show Permissions')}</a></li> |
|
30 | <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('admin_permissions_perms')}">${_('Show Permissions')}</a></li> | |
31 | </ul> |
|
31 | </ul> | |
32 | </div> |
|
|||
33 |
|
32 | |||
34 | <div style="width:750px; float:left; padding: 10px 0px 0px 20px;margin: 0px 0px 0px 10px; border-left: 1px solid #DDDDDD"> |
|
33 | <div> | |
35 | <%include file="/admin/permissions/permissions_${c.active}.html"/> |
|
34 | <%include file="/admin/permissions/permissions_${c.active}.html"/> | |
|
35 | </div> | |||
36 | </div> |
|
36 | </div> | |
37 | </div> |
|
37 | </div> | |
38 |
|
38 |
@@ -1,5 +1,4 b'' | |||||
1 | <div class="ips_wrap"> |
|
1 | <table class="table"> | |
2 | <table class="table"> |
|
|||
3 | %if c.user_ip_map: |
|
2 | %if c.user_ip_map: | |
4 | %for ip in c.user_ip_map: |
|
3 | %for ip in c.user_ip_map: | |
5 | <tr> |
|
4 | <tr> | |
@@ -18,8 +17,7 b'' | |||||
18 | %else: |
|
17 | %else: | |
19 | <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr> |
|
18 | <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr> | |
20 | %endif |
|
19 | %endif | |
21 |
|
|
20 | </table> | |
22 | </div> |
|
|||
23 |
|
21 | |||
24 | ${h.form(url('edit_user_ips_update', id=c.user.user_id))} |
|
22 | ${h.form(url('edit_user_ips_update', id=c.user.user_id))} | |
25 | <div class="form"> |
|
23 | <div class="form"> |
@@ -23,7 +23,7 b'' | |||||
23 | ${self.breadcrumbs()} |
|
23 | ${self.breadcrumbs()} | |
24 | </div> |
|
24 | </div> | |
25 | ${h.form(url('repos_groups'))} |
|
25 | ${h.form(url('repos_groups'))} | |
26 | <div class="form"> |
|
26 | <div class="form panel-body settings"> | |
27 | <div class="form-horizontal"> |
|
27 | <div class="form-horizontal"> | |
28 | <div class="form-group"> |
|
28 | <div class="form-group"> | |
29 | <label class="control-label" for="group_name">${_('Group name')}:</label> |
|
29 | <label class="control-label" for="group_name">${_('Group name')}:</label> |
@@ -31,16 +31,16 b'' | |||||
31 | </div> |
|
31 | </div> | |
32 |
|
32 | |||
33 | ##main |
|
33 | ##main | |
34 | <div style="width: 150px; float:left"> |
|
34 | <div class="panel-body settings"> | |
35 | <ul class="nav nav-pills nav-stacked"> |
|
35 | <ul class="nav nav-pills nav-stacked"> | |
36 | <li class="${'active' if c.active=='settings' else ''}"><a href="${h.url('edit_repo_group', group_name=c.repo_group.group_name)}">${_('Settings')}</a></li> |
|
36 | <li class="${'active' if c.active=='settings' else ''}"><a href="${h.url('edit_repo_group', group_name=c.repo_group.group_name)}">${_('Settings')}</a></li> | |
37 | <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_repo_group_advanced', group_name=c.repo_group.group_name)}">${_('Advanced')}</a></li> |
|
37 | <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_repo_group_advanced', group_name=c.repo_group.group_name)}">${_('Advanced')}</a></li> | |
38 | <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_repo_group_perms', group_name=c.repo_group.group_name)}">${_('Permissions')}</a></li> |
|
38 | <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_repo_group_perms', group_name=c.repo_group.group_name)}">${_('Permissions')}</a></li> | |
39 | </ul> |
|
39 | </ul> | |
40 | </div> |
|
|||
41 |
|
40 | |||
42 | <div style="width:750px; float:left; padding: 10px 0px 0px 20px;margin: 0px 0px 0px 10px; border-left: 1px solid #DDDDDD"> |
|
41 | <div> | |
43 | <%include file="/admin/repo_groups/repo_group_edit_${c.active}.html"/> |
|
42 | <%include file="/admin/repo_groups/repo_group_edit_${c.active}.html"/> | |
|
43 | </div> | |||
44 | </div> |
|
44 | </div> | |
45 | </div> |
|
45 | </div> | |
46 | </%def> |
|
46 | </%def> |
@@ -28,6 +28,8 b'' | |||||
28 | <div class="panel-heading clearfix"> |
|
28 | <div class="panel-heading clearfix"> | |
29 | ${self.breadcrumbs()} |
|
29 | ${self.breadcrumbs()} | |
30 | </div> |
|
30 | </div> | |
31 | <%include file="repo_add_base.html"/> |
|
31 | <div class="panel-body settings"> | |
|
32 | <%include file="repo_add_base.html"/> | |||
|
33 | </div> | |||
32 | </div> |
|
34 | </div> | |
33 | </%def> |
|
35 | </%def> |
@@ -22,22 +22,22 b'' | |||||
22 | ${self.breadcrumbs()} |
|
22 | ${self.breadcrumbs()} | |
23 | </div> |
|
23 | </div> | |
24 |
|
24 | |||
25 | <div style="display:table; padding: 10px 0px; font-size: 14px;font-weight: bold;margin-right: auto;margin-left: auto"> |
|
25 | <div class="panel-body"> | |
26 | <h4 class="text-center"> |
|
26 | <h4 class="text-center"> | |
27 | ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})} |
|
27 | ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})} | |
28 | </h4> |
|
28 | </h4> | |
29 | </div> |
|
|||
30 |
|
29 | |||
31 | <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto"> |
|
30 | <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto"> | |
32 | <div class="progress progress-striped active"> |
|
31 | <div class="progress progress-striped active"> | |
33 | <div class="progress-bar progress-bar" role="progressbar" |
|
32 | <div class="progress-bar progress-bar" role="progressbar" | |
34 | aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%"> |
|
33 | aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%"> | |
35 | </div> |
|
34 | </div> | |
36 | </div> |
|
35 | </div> | |
37 | </div> |
|
36 | </div> | |
38 | <div id="progress_error" style="display: none;"> |
|
37 | <div id="progress_error" style="display: none;"> | |
39 | <div class="alert alert-danger"> |
|
38 | <div class="alert alert-danger"> | |
40 | ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")} |
|
39 | ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")} | |
|
40 | </div> | |||
41 | </div> |
|
41 | </div> | |
42 | </div> |
|
42 | </div> | |
43 | </div> |
|
43 | </div> |
@@ -18,8 +18,8 b'' | |||||
18 |
|
18 | |||
19 | <%def name="main()"> |
|
19 | <%def name="main()"> | |
20 | ${self.repo_context_bar('options')} |
|
20 | ${self.repo_context_bar('options')} | |
21 |
<div class="panel panel-primary" |
|
21 | <div class="panel panel-primary"> | |
22 | <div style="width: 150px; float:left"> |
|
22 | <div class="panel-body settings"> | |
23 | <ul class="nav nav-pills nav-stacked"> |
|
23 | <ul class="nav nav-pills nav-stacked"> | |
24 | <li class="${'active' if c.active=='settings' else ''}"> |
|
24 | <li class="${'active' if c.active=='settings' else ''}"> | |
25 | <a href="${h.url('edit_repo', repo_name=c.repo_name)}">${_('Settings')}</a> |
|
25 | <a href="${h.url('edit_repo', repo_name=c.repo_name)}">${_('Settings')}</a> | |
@@ -43,10 +43,10 b'' | |||||
43 | <a href="${h.url('edit_repo_statistics', repo_name=c.repo_name)}">${_('Statistics')}</a> |
|
43 | <a href="${h.url('edit_repo_statistics', repo_name=c.repo_name)}">${_('Statistics')}</a> | |
44 | </li> |
|
44 | </li> | |
45 | </ul> |
|
45 | </ul> | |
46 | </div> |
|
|||
47 |
|
46 | |||
48 | <div style="width:750px; float:left; padding: 10px 0px 0px 20px;margin: 0px 0px 0px 10px; border-left: 1px solid #DDDDDD"> |
|
47 | <div> | |
49 | <%include file="/admin/repos/repo_edit_${c.active}.html"/> |
|
48 | <%include file="/admin/repos/repo_edit_${c.active}.html"/> | |
|
49 | </div> | |||
50 | </div> |
|
50 | </div> | |
51 | </div> |
|
51 | </div> | |
52 |
|
52 |
@@ -16,13 +16,13 b'' | |||||
16 | </%block> |
|
16 | </%block> | |
17 |
|
17 | |||
18 | <%def name="main()"> |
|
18 | <%def name="main()"> | |
19 |
<div class="panel panel-primary" |
|
19 | <div class="panel panel-primary"> | |
20 | <div class="panel-heading clearfix"> |
|
20 | <div class="panel-heading clearfix"> | |
21 | ${self.breadcrumbs()} |
|
21 | ${self.breadcrumbs()} | |
22 | </div> |
|
22 | </div> | |
23 |
|
23 | |||
24 | ##main |
|
24 | ##main | |
25 | <div style="width: 150px; float:left"> |
|
25 | <div class="panel-body settings"> | |
26 | <ul class="nav nav-pills nav-stacked"> |
|
26 | <ul class="nav nav-pills nav-stacked"> | |
27 | <li class="${'active' if c.active=='vcs' else ''}"><a href="${h.url('admin_settings')}">${_('VCS')}</a></li> |
|
27 | <li class="${'active' if c.active=='vcs' else ''}"><a href="${h.url('admin_settings')}">${_('VCS')}</a></li> | |
28 | <li class="${'active' if c.active=='mapping' else ''}"><a href="${h.url('admin_settings_mapping')}">${_('Remap and Rescan')}</a></li> |
|
28 | <li class="${'active' if c.active=='mapping' else ''}"><a href="${h.url('admin_settings_mapping')}">${_('Remap and Rescan')}</a></li> | |
@@ -33,10 +33,10 b'' | |||||
33 | <li class="${'active' if c.active=='search' else ''}"><a href="${h.url('admin_settings_search')}">${_('Full Text Search')}</a></li> |
|
33 | <li class="${'active' if c.active=='search' else ''}"><a href="${h.url('admin_settings_search')}">${_('Full Text Search')}</a></li> | |
34 | <li class="${'active' if c.active=='system' else ''}"><a href="${h.url('admin_settings_system')}">${_('System Info')}</a></li> |
|
34 | <li class="${'active' if c.active=='system' else ''}"><a href="${h.url('admin_settings_system')}">${_('System Info')}</a></li> | |
35 | </ul> |
|
35 | </ul> | |
36 | </div> |
|
|||
37 |
|
36 | |||
38 | <div style="width:750px; float:left; padding: 10px 0px 0px 20px;margin: 0px 0px 0px 10px; border-left: 1px solid #DDDDDD"> |
|
37 | <div> | |
39 | <%include file="/admin/settings/settings_${c.active}.html"/> |
|
38 | <%include file="/admin/settings/settings_${c.active}.html"/> | |
|
39 | </div> | |||
40 | </div> |
|
40 | </div> | |
41 | </div> |
|
41 | </div> | |
42 |
|
42 |
@@ -22,7 +22,7 b'' | |||||
22 | ${self.breadcrumbs()} |
|
22 | ${self.breadcrumbs()} | |
23 | </div> |
|
23 | </div> | |
24 | ${h.form(url('users_groups'))} |
|
24 | ${h.form(url('users_groups'))} | |
25 | <div class="form"> |
|
25 | <div class="form panel-body settings"> | |
26 | <div class="form-horizontal"> |
|
26 | <div class="form-horizontal"> | |
27 | <div class="form-group"> |
|
27 | <div class="form-group"> | |
28 | <label class="control-label" for="users_group_name">${_('Group name')}:</label> |
|
28 | <label class="control-label" for="users_group_name">${_('Group name')}:</label> |
@@ -18,13 +18,13 b'' | |||||
18 | </%block> |
|
18 | </%block> | |
19 |
|
19 | |||
20 | <%def name="main()"> |
|
20 | <%def name="main()"> | |
21 |
<div class="panel panel-primary" |
|
21 | <div class="panel panel-primary"> | |
22 | <div class="panel-heading clearfix"> |
|
22 | <div class="panel-heading clearfix"> | |
23 | ${self.breadcrumbs()} |
|
23 | ${self.breadcrumbs()} | |
24 | </div> |
|
24 | </div> | |
25 |
|
25 | |||
26 | ##main |
|
26 | ##main | |
27 | <div style="width: 150px; float:left"> |
|
27 | <div class="form panel-body settings"> | |
28 | <ul class="nav nav-pills nav-stacked"> |
|
28 | <ul class="nav nav-pills nav-stacked"> | |
29 | <li class="${'active' if c.active=='settings' else ''}"><a href="${h.url('edit_users_group', id=c.user_group.users_group_id)}">${_('Settings')}</a></li> |
|
29 | <li class="${'active' if c.active=='settings' else ''}"><a href="${h.url('edit_users_group', id=c.user_group.users_group_id)}">${_('Settings')}</a></li> | |
30 | <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_group_advanced', id=c.user_group.users_group_id)}">${_('Advanced')}</a></li> |
|
30 | <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_group_advanced', id=c.user_group.users_group_id)}">${_('Advanced')}</a></li> | |
@@ -32,10 +32,10 b'' | |||||
32 | <li class="${'active' if c.active=='default_perms' else ''}"><a href="${h.url('edit_user_group_default_perms', id=c.user_group.users_group_id)}">${_('Show Permissions')}</a></li> |
|
32 | <li class="${'active' if c.active=='default_perms' else ''}"><a href="${h.url('edit_user_group_default_perms', id=c.user_group.users_group_id)}">${_('Show Permissions')}</a></li> | |
33 | <li class="${'active' if c.active=='members' else ''}"><a href="${h.url('edit_user_group_members', id=c.user_group.users_group_id)}">${_('Show Members')}</a></li> |
|
33 | <li class="${'active' if c.active=='members' else ''}"><a href="${h.url('edit_user_group_members', id=c.user_group.users_group_id)}">${_('Show Members')}</a></li> | |
34 | </ul> |
|
34 | </ul> | |
35 | </div> |
|
|||
36 |
|
35 | |||
37 | <div style="width:750px; float:left; padding: 10px 0px 0px 20px;margin: 0px 0px 0px 10px; border-left: 1px solid #DDDDDD"> |
|
36 | <div> | |
38 | <%include file="/admin/user_groups/user_group_edit_${c.active}.html"/> |
|
37 | <%include file="/admin/user_groups/user_group_edit_${c.active}.html"/> | |
|
38 | </div> | |||
39 | </div> |
|
39 | </div> | |
40 | </div> |
|
40 | </div> | |
41 | </%def> |
|
41 | </%def> |
@@ -1,5 +1,5 b'' | |||||
1 | % if c.group_members_obj: |
|
1 | % if c.group_members_obj: | |
2 | <ul> |
|
2 | <ul class="user_group_member"> | |
3 | %for user in c.group_members_obj: |
|
3 | %for user in c.group_members_obj: | |
4 | <li> |
|
4 | <li> | |
5 | ${h.gravatar_div(user.email, size=24)} |
|
5 | ${h.gravatar_div(user.email, size=24)} | |
@@ -7,6 +7,6 b'' | |||||
7 | </li> |
|
7 | </li> | |
8 | %endfor |
|
8 | %endfor | |
9 | </ul> |
|
9 | </ul> | |
10 |
|
|
10 | %else: | |
11 | <span class="empty_data">${_('No members yet')}</span> |
|
11 | <span class="empty_data">${_('No members yet')}</span> | |
12 |
|
|
12 | %endif |
@@ -22,7 +22,7 b'' | |||||
22 | ${self.breadcrumbs()} |
|
22 | ${self.breadcrumbs()} | |
23 | </div> |
|
23 | </div> | |
24 | ${h.form(url('new_user'))} |
|
24 | ${h.form(url('new_user'))} | |
25 | <div class="form"> |
|
25 | <div class="form panel-body settings"> | |
26 | <div class="form-horizontal"> |
|
26 | <div class="form-horizontal"> | |
27 | <div class="form-group"> |
|
27 | <div class="form-group"> | |
28 | <label class="control-label" for="username">${_('Username')}:</label> |
|
28 | <label class="control-label" for="username">${_('Username')}:</label> |
@@ -18,13 +18,13 b'' | |||||
18 | </%block> |
|
18 | </%block> | |
19 |
|
19 | |||
20 | <%def name="main()"> |
|
20 | <%def name="main()"> | |
21 |
<div class="panel panel-primary" |
|
21 | <div class="panel panel-primary"> | |
22 | <div class="panel-heading clearfix"> |
|
22 | <div class="panel-heading clearfix"> | |
23 | ${self.breadcrumbs()} |
|
23 | ${self.breadcrumbs()} | |
24 | </div> |
|
24 | </div> | |
25 |
|
25 | |||
26 | ##main |
|
26 | ##main | |
27 | <div style="width: 150px; float:left"> |
|
27 | <div class="panel-body settings"> | |
28 | <ul class="nav nav-pills nav-stacked"> |
|
28 | <ul class="nav nav-pills nav-stacked"> | |
29 | <li class="${'active' if c.active=='profile' else ''}"><a href="${h.url('edit_user', id=c.user.user_id)}">${_('Profile')}</a></li> |
|
29 | <li class="${'active' if c.active=='profile' else ''}"><a href="${h.url('edit_user', id=c.user.user_id)}">${_('Profile')}</a></li> | |
30 | <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('edit_user_emails', id=c.user.user_id)}">${_('Emails')}</a></li> |
|
30 | <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('edit_user_emails', id=c.user.user_id)}">${_('Emails')}</a></li> | |
@@ -33,10 +33,10 b'' | |||||
33 | <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_advanced', id=c.user.user_id)}">${_('Advanced')}</a></li> |
|
33 | <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_advanced', id=c.user.user_id)}">${_('Advanced')}</a></li> | |
34 | <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_user_perms', id=c.user.user_id)}">${_('Show Permissions')}</a></li> |
|
34 | <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_user_perms', id=c.user.user_id)}">${_('Show Permissions')}</a></li> | |
35 | </ul> |
|
35 | </ul> | |
36 | </div> |
|
|||
37 |
|
36 | |||
38 | <div style="width:750px; float:left; padding: 10px 0px 0px 20px;margin: 0px 0px 0px 10px; border-left: 1px solid #DDDDDD"> |
|
37 | <div> | |
39 | <%include file="/admin/users/user_edit_${c.active}.html"/> |
|
38 | <%include file="/admin/users/user_edit_${c.active}.html"/> | |
|
39 | </div> | |||
40 | </div> |
|
40 | </div> | |
41 | </div> |
|
41 | </div> | |
42 |
|
42 |
@@ -1,5 +1,4 b'' | |||||
1 | <div class="apikeys_wrap"> |
|
1 | <table class="table"> | |
2 | <table class="table"> |
|
|||
3 | <tr> |
|
2 | <tr> | |
4 | <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td> |
|
3 | <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td> | |
5 | <td> |
|
4 | <td> | |
@@ -48,8 +47,7 b'' | |||||
48 | %else: |
|
47 | %else: | |
49 | <tr><td><div class="ip">${_('No additional API keys specified')}</div></td></tr> |
|
48 | <tr><td><div class="ip">${_('No additional API keys specified')}</div></td></tr> | |
50 | %endif |
|
49 | %endif | |
51 |
|
|
50 | </table> | |
52 | </div> |
|
|||
53 |
|
51 | |||
54 | <div> |
|
52 | <div> | |
55 | ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))} |
|
53 | ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))} |
@@ -1,5 +1,4 b'' | |||||
1 | <div class="ips_wrap"> |
|
1 | <table class="table"> | |
2 | <table class="table"> |
|
|||
3 | %if c.default_user_ip_map and c.inherit_default_ips: |
|
2 | %if c.default_user_ip_map and c.inherit_default_ips: | |
4 | %for ip in c.default_user_ip_map: |
|
3 | %for ip in c.default_user_ip_map: | |
5 | <tr> |
|
4 | <tr> | |
@@ -29,8 +28,7 b'' | |||||
29 | %if not c.default_user_ip_map and not c.user_ip_map: |
|
28 | %if not c.default_user_ip_map and not c.user_ip_map: | |
30 | <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr> |
|
29 | <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr> | |
31 | %endif |
|
30 | %endif | |
32 |
|
|
31 | </table> | |
33 | </div> |
|
|||
34 |
|
32 | |||
35 | <div> |
|
33 | <div> | |
36 | ${h.form(url('edit_user_ips_update', id=c.user.user_id))} |
|
34 | ${h.form(url('edit_user_ips_update', id=c.user.user_id))} |
@@ -45,7 +45,7 b'' | |||||
45 | </%def> |
|
45 | </%def> | |
46 |
|
46 | |||
47 | <%def name="breadcrumbs()"> |
|
47 | <%def name="breadcrumbs()"> | |
48 | <div class="breadcrumbs"> |
|
48 | <div class="breadcrumbs panel-title"> | |
49 | ${self.breadcrumbs_links()} |
|
49 | ${self.breadcrumbs_links()} | |
50 | </div> |
|
50 | </div> | |
51 | </%def> |
|
51 | </%def> |
@@ -33,42 +33,39 b'' | |||||
33 | </div> |
|
33 | </div> | |
34 | <div class="panel-body"> |
|
34 | <div class="panel-body"> | |
35 | %if c.pagination: |
|
35 | %if c.pagination: | |
36 | <div> |
|
36 | <div class="panel"> | |
37 |
<div style=" |
|
37 | <div class="panel-heading clearfix" style="${'display:none' if c.changelog_for_path else ''}"> | |
38 |
<div class=" |
|
38 | <div class="pull-left"> | |
39 | <div class="pull-left"> |
|
39 | ${h.form(h.url.current(),method='get',class_="form-inline")} | |
40 |
${h. |
|
40 | ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")} | |
41 | ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")} |
|
41 | ${h.text('size',size=3,value=c.size,class_='form-control')} | |
42 | ${h.text('size',size=3,value=c.size,class_='form-control')} |
|
42 | ${_('revisions')} | |
43 |
|
|
43 | %if c.branch_name: | |
44 |
|
|
44 | ${h.hidden('branch', c.branch_name)} | |
45 | ${h.hidden('branch', c.branch_name)} |
|
45 | %endif | |
46 | %endif |
|
|||
47 | ${h.end_form()} |
|
|||
48 | <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> |
|
46 | <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> | |
49 |
|
|
47 | ${h.end_form()} | |
50 |
|
|
48 | </div> | |
51 | <a href="#" class="btn btn-default btn-sm" id="rev_range_container" style="display:none"></a> |
|
49 | <div class="pull-right"> | |
52 | %if c.revision: |
|
50 | <a href="#" class="btn btn-default btn-sm" id="rev_range_container" style="display:none"></a> | |
53 | <a class="btn btn-default btn-sm" href="${h.url('changelog_home', repo_name=c.repo_name)}"> |
|
51 | %if c.revision: | |
54 | ${_('Go to tip of repository')} |
|
52 | <a class="btn btn-default btn-sm" href="${h.url('changelog_home', repo_name=c.repo_name)}"> | |
55 |
|
|
53 | ${_('Go to tip of repository')} | |
56 |
|
|
54 | </a> | |
57 |
|
|
55 | %endif | |
58 |
|
|
56 | %if c.db_repo.fork: | |
59 | title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}" |
|
57 | <a id="compare_fork" | |
60 | href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}" |
|
58 | title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}" | |
61 | class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a> |
|
59 | href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}" | |
62 | %endif |
|
60 | class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a> | |
63 | ## text and href of open_new_pr is controlled from javascript |
|
61 | %endif | |
64 | <a id="open_new_pr" class="btn btn-default btn-sm"></a> |
|
62 | ## text and href of open_new_pr is controlled from javascript | |
65 | ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)} |
|
63 | <a id="open_new_pr" class="btn btn-default btn-sm"></a> | |
66 | </div> |
|
64 | ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)} | |
67 | </div> |
|
65 | </div> | |
68 | </div> |
|
66 | </div> | |
69 |
|
67 | |||
70 |
|
|
68 | <div class="panel-body"> | |
71 |
|
||||
72 | <div id="graph_nodes"> |
|
69 | <div id="graph_nodes"> | |
73 | <canvas id="graph_canvas" style="width:0"></canvas> |
|
70 | <canvas id="graph_canvas" style="width:0"></canvas> | |
74 | </div> |
|
71 | </div> | |
@@ -184,8 +181,8 b'' | |||||
184 | <ul class="pagination"> |
|
181 | <ul class="pagination"> | |
185 | ${c.pagination.pager()} |
|
182 | ${c.pagination.pager()} | |
186 | </ul> |
|
183 | </ul> | |
|
184 | </div> | |||
187 | </div> |
|
185 | </div> | |
188 | </div> |
|
|||
189 |
|
186 | |||
190 | <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script> |
|
187 | <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script> | |
191 | <script type="text/javascript"> |
|
188 | <script type="text/javascript"> |
@@ -29,6 +29,7 b'' | |||||
29 | AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; |
|
29 | AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; | |
30 | </script> |
|
30 | </script> | |
31 | <div class="panel-body"> |
|
31 | <div class="panel-body"> | |
|
32 | <div> | |||
32 | <div class="diffblock"> |
|
33 | <div class="diffblock"> | |
33 | <div class="parents"> |
|
34 | <div class="parents"> | |
34 | <div id="parent_link" class="changeset_hash"> |
|
35 | <div id="parent_link" class="changeset_hash"> | |
@@ -182,9 +183,11 b'' | |||||
182 | </div> |
|
183 | </div> | |
183 |
|
184 | |||
184 | </div> |
|
185 | </div> | |
|
186 | </div> | |||
185 |
|
187 | |||
186 |
|
|
188 | ## diff block | |
187 |
|
|
189 | <div class="panel-body"> | |
|
190 | <div class="commentable-diff"> | |||
188 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
|
191 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> | |
189 | ${diff_block.diff_block_js()} |
|
192 | ${diff_block.diff_block_js()} | |
190 | <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %> |
|
193 | <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %> | |
@@ -300,4 +303,5 b'' | |||||
300 | </script> |
|
303 | </script> | |
301 |
|
304 | |||
302 | </div> |
|
305 | </div> | |
|
306 | </div> | |||
303 | </%def> |
|
307 | </%def> |
@@ -23,6 +23,7 b'' | |||||
23 | ${self.breadcrumbs()} |
|
23 | ${self.breadcrumbs()} | |
24 | </div> |
|
24 | </div> | |
25 | <div class="panel-body"> |
|
25 | <div class="panel-body"> | |
|
26 | <div> | |||
26 | <div id="body" class="diffblock"> |
|
27 | <div id="body" class="diffblock"> | |
27 | <div class="code-header"> |
|
28 | <div class="code-header"> | |
28 | <div> |
|
29 | <div> | |
@@ -71,11 +72,13 b'' | |||||
71 | %endfor |
|
72 | %endfor | |
72 | </div> |
|
73 | </div> | |
73 | </div> |
|
74 | </div> | |
|
75 | </div> | |||
74 | </div> |
|
76 | </div> | |
75 | <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> |
|
77 | <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> | |
76 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
|
78 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> | |
77 | ${diff_block.diff_block_js()} |
|
79 | ${diff_block.diff_block_js()} | |
78 | %for cs in c.cs_ranges: |
|
80 | %for cs in c.cs_ranges: | |
|
81 | <div class="panel-body"> | |||
79 | ## diff block |
|
82 | ## diff block | |
80 | <div class="h3"> |
|
83 | <div class="h3"> | |
81 | <a data-toggle="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a> |
|
84 | <a data-toggle="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a> | |
@@ -107,6 +110,7 b'' | |||||
107 | <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %> |
|
110 | <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %> | |
108 | ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev, |
|
111 | ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev, | |
109 | c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)} |
|
112 | c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)} | |
|
113 | </div> | |||
110 | %endfor |
|
114 | %endfor | |
111 | </div> |
|
115 | </div> | |
112 | </%def> |
|
116 | </%def> |
@@ -24,6 +24,7 b'' | |||||
24 | ${self.breadcrumbs()} |
|
24 | ${self.breadcrumbs()} | |
25 | </div> |
|
25 | </div> | |
26 | <div class="panel-body"> |
|
26 | <div class="panel-body"> | |
|
27 | <div> | |||
27 | <div id="body" class="diffblock"> |
|
28 | <div id="body" class="diffblock"> | |
28 | <div class="compare-revision-selector"> |
|
29 | <div class="compare-revision-selector"> | |
29 | ## divs are "inline-block" and cannot have whitespace between them. |
|
30 | ## divs are "inline-block" and cannot have whitespace between them. | |
@@ -80,7 +81,7 b'' | |||||
80 | <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5> |
|
81 | <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5> | |
81 | %endif |
|
82 | %endif | |
82 | </div> |
|
83 | </div> | |
83 |
|
|
84 | </div> | |
84 |
|
85 | |||
85 | ## diff block |
|
86 | ## diff block | |
86 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
|
87 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> | |
@@ -90,6 +91,7 b'' | |||||
90 | % if c.limited_diff: |
|
91 | % if c.limited_diff: | |
91 | <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4> |
|
92 | <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4> | |
92 | % endif |
|
93 | % endif | |
|
94 | <div> | |||
93 | %endif |
|
95 | %endif | |
94 | </div> |
|
96 | </div> | |
95 |
|
97 |
@@ -18,7 +18,7 b'' | |||||
18 | <div class="panel-heading clearfix"> |
|
18 | <div class="panel-heading clearfix"> | |
19 | ${self.breadcrumbs()} |
|
19 | ${self.breadcrumbs()} | |
20 | </div> |
|
20 | </div> | |
21 | <div> |
|
21 | <div class="panel-body"> | |
22 | ## diff block |
|
22 | ## diff block | |
23 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
|
23 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> | |
24 | ${diff_block.diff_block_js()} |
|
24 | ${diff_block.diff_block_js()} |
@@ -55,7 +55,7 b'' | |||||
55 | </div> |
|
55 | </div> | |
56 | </div> |
|
56 | </div> | |
57 |
|
57 | |||
58 |
<div class=" |
|
58 | <div class="panel-body"> | |
59 | <table class="table code-browser"> |
|
59 | <table class="table code-browser"> | |
60 | <thead> |
|
60 | <thead> | |
61 | <tr> |
|
61 | <tr> |
@@ -20,7 +20,7 b'' | |||||
20 | ${self.breadcrumbs()} |
|
20 | ${self.breadcrumbs()} | |
21 | </div> |
|
21 | </div> | |
22 | ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))} |
|
22 | ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))} | |
23 | <div class="form"> |
|
23 | <div class="form panel-body settings"> | |
24 | <div class="form-horizontal"> |
|
24 | <div class="form-horizontal"> | |
25 |
|
25 | |||
26 | <div class="form-group"> |
|
26 | <div class="form-group"> |
@@ -1,7 +1,7 b'' | |||||
1 | <%page args="parent,group_name=''" /> |
|
1 | <%page args="parent,group_name=''" /> | |
2 | <div class="panel panel-primary"> |
|
2 | <div class="panel panel-primary"> | |
3 | <div class="panel-heading clearfix"> |
|
3 | <div class="panel-heading clearfix"> | |
4 | <div class="breadcrumbs"> |
|
4 | <div class="pull-left breadcrumbs"> | |
5 | %if c.group is not None: |
|
5 | %if c.group is not None: | |
6 | %for group in c.group.parents: |
|
6 | %for group in c.group.parents: | |
7 | ${h.link_to(group.name, url('repos_group_home', group_name=group.group_name))} |
|
7 | ${h.link_to(group.name, url('repos_group_home', group_name=group.group_name))} | |
@@ -12,7 +12,7 b'' | |||||
12 | </div> |
|
12 | </div> | |
13 |
|
13 | |||
14 | %if c.authuser.username != 'default': |
|
14 | %if c.authuser.username != 'default': | |
15 | <ul class="links"> |
|
15 | <ul class="pull-right links"> | |
16 | <li> |
|
16 | <li> | |
17 | <% |
|
17 | <% | |
18 | gr_name = c.group.group_name if c.group else None |
|
18 | gr_name = c.group.group_name if c.group else None | |
@@ -43,7 +43,6 b'' | |||||
43 | </div> |
|
43 | </div> | |
44 | %if c.groups: |
|
44 | %if c.groups: | |
45 | <div class="panel-body"> |
|
45 | <div class="panel-body"> | |
46 | <div id='groups_list_wrap'> |
|
|||
47 | <table id="groups_list" class="table"> |
|
46 | <table id="groups_list" class="table"> | |
48 | <thead> |
|
47 | <thead> | |
49 | <tr> |
|
48 | <tr> | |
@@ -71,10 +70,9 b'' | |||||
71 | </tr> |
|
70 | </tr> | |
72 | % endfor |
|
71 | % endfor | |
73 | </table> |
|
72 | </table> | |
74 | </div> |
|
|||
75 | </div> |
|
73 | </div> | |
76 | %endif |
|
74 | %endif | |
77 | <div> |
|
75 | <div class="panel-body"> | |
78 | <table class="table" id="repos_list_wrap"></table> |
|
76 | <table class="table" id="repos_list_wrap"></table> | |
79 | </div> |
|
77 | </div> | |
80 | </div> |
|
78 | </div> |
@@ -25,14 +25,14 b'' | |||||
25 | <div class="pull-left"> |
|
25 | <div class="pull-left"> | |
26 | ${self.breadcrumbs()} |
|
26 | ${self.breadcrumbs()} | |
27 | </div> |
|
27 | </div> | |
28 |
<div class="pull-right |
|
28 | <div class="pull-right panel-title"> | |
29 | <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i> ${_('Watched Repositories')}</a> |
|
29 | <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i> ${_('Watched Repositories')}</a> | |
30 | <a href="${h.url('my_account_repos')}"><i class="icon-database"></i> ${_('My Repositories')}</a> |
|
30 | <a href="${h.url('my_account_repos')}"><i class="icon-database"></i> ${_('My Repositories')}</a> | |
31 | <a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a> |
|
31 | <a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a> | |
32 | <a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a> |
|
32 | <a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a> | |
33 | </div> |
|
33 | </div> | |
34 | </div> |
|
34 | </div> | |
35 | <div id="journal"> |
|
35 | <div id="journal" class="panel-body"> | |
36 | <%include file='journal_data.html'/> |
|
36 | <%include file='journal_data.html'/> | |
37 | </div> |
|
37 | </div> | |
38 | </div> |
|
38 | </div> |
@@ -20,12 +20,12 b'' | |||||
20 | <div class="pull-left"> |
|
20 | <div class="pull-left"> | |
21 | ${_('Public Journal')} |
|
21 | ${_('Public Journal')} | |
22 | </div> |
|
22 | </div> | |
23 | <div class="pull-right"> |
|
23 | <div class="pull-right panel-title"> | |
24 | <a href="${h.url('public_journal_atom')}"><i class="icon-rss-squared"></i></a> |
|
24 | <a href="${h.url('public_journal_atom')}"><i class="icon-rss-squared"></i></a> | |
25 | </div> |
|
25 | </div> | |
26 | </div> |
|
26 | </div> | |
27 |
|
27 | |||
28 | <div id="journal"> |
|
28 | <div id="journal" class="panel-body"> | |
29 | <%include file='journal_data.html'/> |
|
29 | <%include file='journal_data.html'/> | |
30 | </div> |
|
30 | </div> | |
31 | </div> |
|
31 | </div> |
@@ -5,16 +5,16 b'' | |||||
5 | ${_('Log In')} |
|
5 | ${_('Log In')} | |
6 | </%block> |
|
6 | </%block> | |
7 |
|
7 | |||
8 | <div id="login" class="panel panel-default"> |
|
8 | <%include file="/base/flash_msg.html"/> | |
9 | <%include file="/base/flash_msg.html"/> |
|
9 | <div id="login" class="panel panel-primary"> | |
10 |
<div class="panel-heading |
|
10 | <div class="panel-heading"> | |
11 | %if c.site_name: |
|
11 | %if c.site_name: | |
12 | <h5>${_('Log In to %s') % c.site_name}</h5> |
|
12 | <h5>${_('Log In to %s') % c.site_name}</h5> | |
13 | %else: |
|
13 | %else: | |
14 | <h5>${_('Log In')}</h5> |
|
14 | <h5>${_('Log In')}</h5> | |
15 | %endif |
|
15 | %endif | |
16 | </div> |
|
16 | </div> | |
17 |
<div class="panel-body |
|
17 | <div class="panel-body"> | |
18 | ${h.form(url('login_home', came_from=c.came_from))} |
|
18 | ${h.form(url('login_home', came_from=c.came_from))} | |
19 | <div class="form"> |
|
19 | <div class="form"> | |
20 | <i class="icon-lock"></i> |
|
20 | <i class="icon-lock"></i> |
@@ -5,16 +5,16 b'' | |||||
5 | ${_('Password Reset')} |
|
5 | ${_('Password Reset')} | |
6 | </%block> |
|
6 | </%block> | |
7 |
|
7 | |||
8 | <div id="register"> |
|
8 | <%include file="/base/flash_msg.html"/> | |
9 | <%include file="/base/flash_msg.html"/> |
|
9 | <div id="register" class="panel panel-primary"> | |
10 |
<div class="panel-heading |
|
10 | <div class="panel-heading"> | |
11 | %if c.site_name: |
|
11 | %if c.site_name: | |
12 | <h5>${_('Reset Your Password to %s') % c.site_name}</h5> |
|
12 | <h5>${_('Reset Your Password to %s') % c.site_name}</h5> | |
13 | %else: |
|
13 | %else: | |
14 | <h5>${_('Reset Your Password')}</h5> |
|
14 | <h5>${_('Reset Your Password')}</h5> | |
15 | %endif |
|
15 | %endif | |
16 | </div> |
|
16 | </div> | |
17 |
<div class=" |
|
17 | <div class="panel-body"> | |
18 | ${h.form(url('password_reset'))} |
|
18 | ${h.form(url('password_reset'))} | |
19 | <div class="form"> |
|
19 | <div class="form"> | |
20 | <div class="form-horizontal"> |
|
20 | <div class="form-horizontal"> | |
@@ -64,4 +64,4 b'' | |||||
64 | }); |
|
64 | }); | |
65 | </script> |
|
65 | </script> | |
66 | </div> |
|
66 | </div> | |
67 |
|
|
67 | </div> |
@@ -5,23 +5,22 b'' | |||||
5 | ${_('Reset Your Password')} |
|
5 | ${_('Reset Your Password')} | |
6 | </%block> |
|
6 | </%block> | |
7 |
|
7 | |||
8 | <div id="register"> |
|
8 | <%include file="/base/flash_msg.html"/> | |
9 | <%include file="/base/flash_msg.html"/> |
|
9 | ||
10 |
|
|
10 | <div class="panel panel-primary"> | |
|
11 | <div class="panel-heading"> | |||
11 | %if c.site_name: |
|
12 | %if c.site_name: | |
12 | <h5>${_('Reset Your Password to %s') % c.site_name}</h5> |
|
13 | <h5>${_('Reset Your Password to %s') % c.site_name}</h5> | |
13 | %else: |
|
14 | %else: | |
14 | <h5>${_('Reset Your Password')}</h5> |
|
15 | <h5>${_('Reset Your Password')}</h5> | |
15 | %endif |
|
16 | %endif | |
16 | </div> |
|
17 | </div> | |
17 |
<div class=" |
|
18 | <div class="panel-body"> | |
18 | ${h.form(h.url('reset_password_confirmation'), method='post')} |
|
19 | ${h.form(h.url('reset_password_confirmation'), method='post')} | |
19 | <p>${_('You are about to set a new password for the email address %s.') % c.email}</p> |
|
20 | <p>${_('You are about to set a new password for the email address %s.') % c.email}</p> | |
20 | <p>${_('Note that you must use the same browser session for this as the one used to request the password reset.')}</p> |
|
21 | <p>${_('Note that you must use the same browser session for this as the one used to request the password reset.')}</p> | |
21 | <div style="display: none;"> |
|
22 | ${h.hidden('email')} | |
22 |
|
|
23 | ${h.hidden('timestamp')} | |
23 | ${h.hidden('timestamp')} |
|
|||
24 | </div> |
|
|||
25 | <div class="form"> |
|
24 | <div class="form"> | |
26 | <div class="form-horizontal"> |
|
25 | <div class="form-horizontal"> | |
27 | <div class="form-group"> |
|
26 | <div class="form-group"> |
@@ -20,9 +20,9 b'' | |||||
20 | </div> |
|
20 | </div> | |
21 |
|
21 | |||
22 | ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')} |
|
22 | ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')} | |
23 | <div class="form"> |
|
23 | <div class="form panel-body"> | |
24 |
|
24 | <div class="settings clearfix"> | ||
25 | <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;"> |
|
25 | <div class="form-horizontal"> | |
26 |
|
26 | |||
27 | <div class="form-group"> |
|
27 | <div class="form-group"> | |
28 | <label class="control-label" for="pullrequest_title">${_('Title')}:</label> |
|
28 | <label class="control-label" for="pullrequest_title">${_('Title')}:</label> | |
@@ -40,7 +40,7 b'' | |||||
40 |
|
40 | |||
41 | <div class="form-group"> |
|
41 | <div class="form-group"> | |
42 | <label class="control-label">${_('Changeset flow')}:</label> |
|
42 | <label class="control-label">${_('Changeset flow')}:</label> | |
43 | <div> |
|
43 | <div class="clearfix"> | |
44 | ##ORG |
|
44 | ##ORG | |
45 | <div> |
|
45 | <div> | |
46 | <div> |
|
46 | <div> | |
@@ -71,7 +71,6 b'' | |||||
71 | </div> |
|
71 | </div> | |
72 | </div> |
|
72 | </div> | |
73 | </div> |
|
73 | </div> | |
74 | <div style="clear:both"></div> |
|
|||
75 | </div> |
|
74 | </div> | |
76 | </div> |
|
75 | </div> | |
77 |
|
76 | |||
@@ -82,12 +81,13 b'' | |||||
82 | </div> |
|
81 | </div> | |
83 | </div> |
|
82 | </div> | |
84 |
|
83 | |||
|
84 | </div> | |||
85 | </div> |
|
85 | </div> | |
86 |
|
86 | |||
87 | <div style="clear:both;padding: 0 0 30px 0;"></div> |
|
87 | <div style="clear:both;padding: 0 0 30px 0;"></div> | |
88 |
|
88 | |||
89 | <h4>${_('Changesets')}</h4> |
|
|||
90 | <div style="float:left;padding:0px 30px 30px 30px"> |
|
89 | <div style="float:left;padding:0px 30px 30px 30px"> | |
|
90 | <h4>${_('Changesets')}</h4> | |||
91 | ## overview pulled by ajax |
|
91 | ## overview pulled by ajax | |
92 | <div style="float:left" id="pull_request_overview"></div> |
|
92 | <div style="float:left" id="pull_request_overview"></div> | |
93 | </div> |
|
93 | </div> |
@@ -22,7 +22,7 b'' | |||||
22 | ${self.breadcrumbs()} |
|
22 | ${self.breadcrumbs()} | |
23 | </div> |
|
23 | </div> | |
24 |
|
24 | |||
25 | ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')} |
|
25 | ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form',class_='panel-body')} | |
26 | <div class="form pr-box" style="float: left"> |
|
26 | <div class="form pr-box" style="float: left"> | |
27 | <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}"> |
|
27 | <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}"> | |
28 | <h3> |
|
28 | <h3> | |
@@ -152,7 +152,7 b'' | |||||
152 | <div> |
|
152 | <div> | |
153 | <div class="msg-div">${c.update_msg}</div> |
|
153 | <div class="msg-div">${c.update_msg}</div> | |
154 | %if c.avail_revs: |
|
154 | %if c.avail_revs: | |
155 | <div id="updaterevs" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px; padding: 1px 0"> |
|
155 | <div id="updaterevs" class="clearfix" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px; padding: 1px 0"> | |
156 | <div style="height:0;width:40px"> |
|
156 | <div style="height:0;width:40px"> | |
157 | <canvas id="avail_graph_canvas" style="width:0"></canvas> |
|
157 | <canvas id="avail_graph_canvas" style="width:0"></canvas> | |
158 | </div> |
|
158 | </div> | |
@@ -286,7 +286,8 b'' | |||||
286 | <div class="breadcrumbs">${_('Pull Request Content')}</div> |
|
286 | <div class="breadcrumbs">${_('Pull Request Content')}</div> | |
287 | </div> |
|
287 | </div> | |
288 | <div class="panel-body"> |
|
288 | <div class="panel-body"> | |
289 | <div id="changeset_compare_view_content"> |
|
289 | <div> | |
|
290 | <div id="changeset_compare_view_content"> | |||
290 | <h5> |
|
291 | <h5> | |
291 | ${comment.comment_count(c.inline_cnt, len(c.comments))} |
|
292 | ${comment.comment_count(c.inline_cnt, len(c.comments))} | |
292 | </h5> |
|
293 | </h5> | |
@@ -326,7 +327,8 b'' | |||||
326 | <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5> |
|
327 | <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5> | |
327 | %endif |
|
328 | %endif | |
328 | </div> |
|
329 | </div> | |
329 | </div> |
|
330 | </div> | |
|
331 | </div> | |||
330 | </div> |
|
332 | </div> | |
331 | <script> |
|
333 | <script> | |
332 | var _USERS_AC_DATA = ${c.users_array|n}; |
|
334 | var _USERS_AC_DATA = ${c.users_array|n}; | |
@@ -341,6 +343,7 b'' | |||||
341 | </script> |
|
343 | </script> | |
342 |
|
344 | |||
343 | ## diff block |
|
345 | ## diff block | |
|
346 | <div class="panel-body"> | |||
344 | <div class="commentable-diff"> |
|
347 | <div class="commentable-diff"> | |
345 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
|
348 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> | |
346 | ${diff_block.diff_block_js()} |
|
349 | ${diff_block.diff_block_js()} | |
@@ -350,6 +353,7 b'' | |||||
350 | <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4> |
|
353 | <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4> | |
351 | % endif |
|
354 | % endif | |
352 | </div> |
|
355 | </div> | |
|
356 | </div> | |||
353 |
|
357 | |||
354 | ## template for inline comment form |
|
358 | ## template for inline comment form | |
355 | ${comment.comment_inline_form()} |
|
359 | ${comment.comment_inline_form()} |
@@ -38,7 +38,7 b'' | |||||
38 | </div> |
|
38 | </div> | |
39 | </div> |
|
39 | </div> | |
40 |
|
40 | |||
41 |
<div class=" |
|
41 | <div class="panel-body"> | |
42 | <div> |
|
42 | <div> | |
43 | %if c.closed: |
|
43 | %if c.closed: | |
44 | ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))} |
|
44 | ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))} | |
@@ -46,9 +46,9 b'' | |||||
46 | ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))} |
|
46 | ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))} | |
47 | %endif |
|
47 | %endif | |
48 | </div> |
|
48 | </div> | |
|
49 | ||||
|
50 | ${pullrequest_data.pullrequest_overview(c.pullrequests_pager)} | |||
49 | </div> |
|
51 | </div> | |
50 |
|
52 | |||
51 | ${pullrequest_data.pullrequest_overview(c.pullrequests_pager)} |
|
|||
52 |
|
||||
53 | </div> |
|
53 | </div> | |
54 | </%def> |
|
54 | </%def> |
@@ -21,7 +21,8 b'' | |||||
21 | ${self.breadcrumbs()} |
|
21 | ${self.breadcrumbs()} | |
22 | </div> |
|
22 | </div> | |
23 |
|
23 | |||
24 |
<div class=" |
|
24 | <div class="panel-body"> | |
|
25 | <div> | |||
25 | <div> |
|
26 | <div> | |
26 | %if c.closed: |
|
27 | %if c.closed: | |
27 | ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('my_pullrequests'))} |
|
28 | ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('my_pullrequests'))} | |
@@ -38,6 +39,7 b'' | |||||
38 |
|
39 | |||
39 | <h4>${_('Pull Requests I Participate In')}</h4> |
|
40 | <h4>${_('Pull Requests I Participate In')}</h4> | |
40 | ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)} |
|
41 | ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)} | |
|
42 | </div> | |||
41 | </div> |
|
43 | </div> | |
42 | </div> |
|
44 | </div> | |
43 | </%def> |
|
45 | </%def> |
@@ -5,16 +5,17 b'' | |||||
5 | ${_('Sign Up')} |
|
5 | ${_('Sign Up')} | |
6 | </%block> |
|
6 | </%block> | |
7 |
|
7 | |||
8 | <div id="register"> |
|
8 | <%include file="/base/flash_msg.html"/> | |
9 | <%include file="/base/flash_msg.html"/> |
|
9 | ||
10 | <div class="panel-heading clearfix"> |
|
10 | <div id="register" class="panel panel-primary"> | |
|
11 | <div class="panel-heading"> | |||
11 | %if c.site_name: |
|
12 | %if c.site_name: | |
12 | <h5>${_('Sign Up to %s') % c.site_name}</h5> |
|
13 | <h5>${_('Sign Up to %s') % c.site_name}</h5> | |
13 | %else: |
|
14 | %else: | |
14 | <h5>${_('Sign Up')}</h5> |
|
15 | <h5>${_('Sign Up')}</h5> | |
15 | %endif |
|
16 | %endif | |
16 | </div> |
|
17 | </div> | |
17 |
<div class=" |
|
18 | <div class="panel-body"> | |
18 | ${h.form(url('register'))} |
|
19 | ${h.form(url('register'))} | |
19 | <div class="form"> |
|
20 | <div class="form"> | |
20 | <div class="form-horizontal"> |
|
21 | <div class="form-horizontal"> |
@@ -41,7 +41,8 b'' | |||||
41 | %else: |
|
41 | %else: | |
42 | ${h.form(h.url('search'),method='get')} |
|
42 | ${h.form(h.url('search'),method='get')} | |
43 | %endif |
|
43 | %endif | |
44 | <div class="form"> |
|
44 | ||
|
45 | <div class="panel-body settings form"> | |||
45 | <div class="form-horizontal"> |
|
46 | <div class="form-horizontal"> | |
46 | <div class="form-group"> |
|
47 | <div class="form-group"> | |
47 | <label class="control-label" for="q">${_('Search term')}:</label> |
|
48 | <label class="control-label" for="q">${_('Search term')}:</label> |
@@ -2,8 +2,8 b'' | |||||
2 |
|
2 | |||
3 | %for cnt,sr in enumerate(c.formated_results): |
|
3 | %for cnt,sr in enumerate(c.formated_results): | |
4 | %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'): |
|
4 | %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'): | |
5 |
<div class=" |
|
5 | <div class="panel panel-default"> | |
6 |
<div class=" |
|
6 | <div class="panel-heading"> | |
7 | ${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), |
|
7 | ${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), | |
8 | h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))} |
|
8 | h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))} | |
9 | </div> |
|
9 | </div> |
@@ -27,7 +27,7 b'' | |||||
27 | ${self.breadcrumbs()} |
|
27 | ${self.breadcrumbs()} | |
28 | </div> |
|
28 | </div> | |
29 |
|
29 | |||
30 | <div class="graph"> |
|
30 | <div class="graph panel-body"> | |
31 | <div style="padding:0 10px 10px 17px;"> |
|
31 | <div style="padding:0 10px 10px 17px;"> | |
32 | %if c.no_data: |
|
32 | %if c.no_data: | |
33 | ${c.no_data_msg} |
|
33 | ${c.no_data_msg} |
@@ -63,7 +63,7 b" summary = lambda n:{False:'summary-short" | |||||
63 | <div class="panel-heading clearfix"> |
|
63 | <div class="panel-heading clearfix"> | |
64 | ${self.breadcrumbs()} |
|
64 | ${self.breadcrumbs()} | |
65 | </div> |
|
65 | </div> | |
66 | <div class="form"> |
|
66 | <div id="summary-panel-body" class="form panel-body"> | |
67 | <div id="summary" class="form-horizontal"> |
|
67 | <div id="summary" class="form-horizontal"> | |
68 | <div class="form-group form-inline clearfix"> |
|
68 | <div class="form-group form-inline clearfix"> | |
69 | <label>${_('Clone URL')}:</label> |
|
69 | <label>${_('Clone URL')}:</label> | |
@@ -170,7 +170,7 b" summary = lambda n:{False:'summary-short" | |||||
170 |
|
170 | |||
171 |
|
171 | |||
172 | <div class="panel panel-primary"> |
|
172 | <div class="panel panel-primary"> | |
173 |
<div class="panel-heading |
|
173 | <div class="panel-heading"> | |
174 | <div class="breadcrumbs panel-title"> |
|
174 | <div class="breadcrumbs panel-title"> | |
175 | %if c.repo_changesets: |
|
175 | %if c.repo_changesets: | |
176 | ${h.link_to(_('Latest Changes'),h.url('changelog_home',repo_name=c.repo_name))} |
|
176 | ${h.link_to(_('Latest Changes'),h.url('changelog_home',repo_name=c.repo_name))} |
General Comments 0
You need to be logged in to leave comments.
Login now