diff --git a/pagure/default_config.py b/pagure/default_config.py index fa88fa6..5383960 100644 --- a/pagure/default_config.py +++ b/pagure/default_config.py @@ -109,7 +109,7 @@ CELERY_CONFIG = {} # Redis configuration EVENTSOURCE_SOURCE = None -WEBHOOK = False +WEBHOOK = True REDIS_HOST = '0.0.0.0' REDIS_PORT = 6379 REDIS_DB = 0 diff --git a/pagure/static/issue_ev.js b/pagure/static/issue_ev.js index 53ec345..99b4dc6 100644 --- a/pagure/static/issue_ev.js +++ b/pagure/static/issue_ev.js @@ -165,19 +165,19 @@ add_comment = function(data, username) { \ diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css index 2286633..4a56eb1 100644 --- a/pagure/static/pagure.css +++ b/pagure/static/pagure.css @@ -3,6 +3,38 @@ html font-size:14px; } +.container{ + max-width: 1100px!important; +} + +.btn-outline-light { + color: #666; + background-color: #f4f4f4; + background-image: none; + border-color: #bbb; +} + +.nowrap{ + white-space: nowrap; +} + +.dropdown-item:hover{ + color: #fff; + text-decoration: none; + background-color: #3c6eb4; +} + +.btn-outline-light:hover, +.btn-outline-light:active, +.btn-outline-light:focus, +.btn-outline-light.active, .show > .btn-outline-light.dropdown-toggle +{ + color: #666; + background-color: #ddd; + background-image: none; + border-color: #bbb; +} + .right { float: right; } @@ -182,6 +214,7 @@ white-space: nowrap; .bodycontent { min-height: 85vh; +z-index:1; } .oi-spin { @@ -257,6 +290,21 @@ min-height: 85vh; right:6px!important; } +#headerSearch .selectize-control.single .selectize-input::after +{ + content: "\f002"; + font-family: "FontAwesome"; + border:none; + top:30%; + right:22px; + color:#aaa; +} + +#headerSearch .selectize-control{ + width:250px; + margin-top:3px; +} + .button-label{ padding: .25rem .75rem; font-size: .875rem; @@ -414,15 +462,6 @@ a.notblue:hover { text-decoration:underline; } -#headerSearch .selectize-control.single .selectize-input::after -{ - content: "\e08f"; - font-family: "Icons"; - border:none; - top:30%; - right:22px; - color:#aaa; -} .footer a, .footer a:hover { color: #d9d9d9; } @@ -648,6 +687,11 @@ a.nav-link.btn{ .masthead{ background-color:#ddd; + border-bottom: 1px solid #ccc; + box-shadow: 0 0 10px 2px #ddd; + z-index: 999; + padding-top:7px; + padding-bottom:7px; } .semi_link { @@ -728,3 +772,31 @@ a.nav-link.btn{ .codehilite .vg { color: #000000 } /* Name.Variable.Global */ .codehilite .vi { color: #000000 } /* Name.Variable.Instance */ .codehilite .il { color: #0000cf; font-weight: bold } /* Literal.Number.Integer.Long */ + + +.nav-sidetabs{ + height: 100%; + border-right: 1px solid #ddd; + padding-top: 1em; + min-height: 85vh; +} + +.nav-tabs.nav-sidetabs .nav-link.active{ + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + border-left: 1px solid #ddd; + border-right: 1px solid #fff; + box-shadow: 2px 0 0 0 white; +} + +.nav-tabs.nav-sidetabs .nav-link:focus, .nav-tabs.nav-sidetabs .nav-link:hover{ + background: #f5f5f5; + border: 1px solid white; +} + +.nav-tabs.nav-sidetabs .nav-link.active:focus, .nav-tabs.nav-sidetabs .nav-link.active:hover{ + background: #fff; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + border-left: 1px solid #ddd; +} diff --git a/pagure/static/request_ev.js b/pagure/static/request_ev.js index 4f5aa43..ff96c30 100644 --- a/pagure/static/request_ev.js +++ b/pagure/static/request_ev.js @@ -8,7 +8,7 @@ add_comment = function(data, username) { href="/' + data.project + '/pull-request/' + data.request_id + '/comment/' + data.comment_id + '/edit" \ data-comment="' + data.comment_id + '" \ data-objid="' + data.request_id + '"> \ - \ + \ '; } var inline = false; @@ -52,7 +52,7 @@ add_comment = function(data, username) { if (data.comment_id) { _data += '\ \ - \ + \ '; } if ( data.comment_user == username && data.comment_id) { @@ -60,7 +60,7 @@ add_comment = function(data, username) { ''; } _data += ' \ @@ -98,7 +98,7 @@ add_comment = function(data, username) { if (data.comment_id) { _data += '\ \ - \ + \ '; } if ( data.comment_user == username && data.comment_id) { @@ -106,7 +106,7 @@ add_comment = function(data, username) { ''; } _data += ' \ diff --git a/pagure/static/vendor/font-awesome/font-awesome.css b/pagure/static/vendor/font-awesome/font-awesome.css new file mode 100644 index 0000000..2940838 --- /dev/null +++ b/pagure/static/vendor/font-awesome/font-awesome.css @@ -0,0 +1,2337 @@ +/*! + * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */ +/* FONT PATH + * -------------------------- */ +@font-face { + font-family: 'FontAwesome'; + src: url('font-awesome/fontawesome-webfont.eot?v=4.7.0'); + src: url('font-awesome/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('font-awesome/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('font-awesome/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('font-awesome/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('font-awesome/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg'), local("FontAwesome"); + font-weight: normal; + font-style: normal; +} +.fa { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +/* makes the font 33% larger relative to the icon container */ +.fa-lg { + font-size: 1.33333333em; + line-height: 0.75em; + vertical-align: -15%; +} +.fa-2x { + font-size: 2em; +} +.fa-3x { + font-size: 3em; +} +.fa-4x { + font-size: 4em; +} +.fa-5x { + font-size: 5em; +} +.fa-fw { + width: 1.28571429em; + text-align: center; +} +.fa-ul { + padding-left: 0; + margin-left: 2.14285714em; + list-style-type: none; +} +.fa-ul > li { + position: relative; +} +.fa-li { + position: absolute; + left: -2.14285714em; + width: 2.14285714em; + top: 0.14285714em; + text-align: center; +} +.fa-li.fa-lg { + left: -1.85714286em; +} +.fa-border { + padding: .2em .25em .15em; + border: solid 0.08em #eeeeee; + border-radius: .1em; +} +.fa-pull-left { + float: left; +} +.fa-pull-right { + float: right; +} +.fa.fa-pull-left { + margin-right: .3em; +} +.fa.fa-pull-right { + margin-left: .3em; +} +/* Deprecated as of 4.4.0 */ +.pull-right { + float: right; +} +.pull-left { + float: left; +} +.fa.pull-left { + margin-right: .3em; +} +.fa.pull-right { + margin-left: .3em; +} +.fa-spin { + -webkit-animation: fa-spin 2s infinite linear; + animation: fa-spin 2s infinite linear; +} +.fa-pulse { + -webkit-animation: fa-spin 1s infinite steps(8); + animation: fa-spin 1s infinite steps(8); +} +@-webkit-keyframes fa-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes fa-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +.fa-rotate-90 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)"; + -webkit-transform: rotate(90deg); + -ms-transform: rotate(90deg); + transform: rotate(90deg); +} +.fa-rotate-180 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)"; + -webkit-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); +} +.fa-rotate-270 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)"; + -webkit-transform: rotate(270deg); + -ms-transform: rotate(270deg); + transform: rotate(270deg); +} +.fa-flip-horizontal { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)"; + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); +} +.fa-flip-vertical { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"; + -webkit-transform: scale(1, -1); + -ms-transform: scale(1, -1); + transform: scale(1, -1); +} +:root .fa-rotate-90, +:root .fa-rotate-180, +:root .fa-rotate-270, +:root .fa-flip-horizontal, +:root .fa-flip-vertical { + filter: none; +} +.fa-stack { + position: relative; + display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: middle; +} +.fa-stack-1x, +.fa-stack-2x { + position: absolute; + left: 0; + width: 100%; + text-align: center; +} +.fa-stack-1x { + line-height: inherit; +} +.fa-stack-2x { + font-size: 2em; +} +.fa-inverse { + color: #ffffff; +} +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.fa-glass:before { + content: "\f000"; +} +.fa-music:before { + content: "\f001"; +} +.fa-search:before { + content: "\f002"; +} +.fa-envelope-o:before { + content: "\f003"; +} +.fa-heart:before { + content: "\f004"; +} +.fa-star:before { + content: "\f005"; +} +.fa-star-o:before { + content: "\f006"; +} +.fa-user:before { + content: "\f007"; +} +.fa-film:before { + content: "\f008"; +} +.fa-th-large:before { + content: "\f009"; +} +.fa-th:before { + content: "\f00a"; +} +.fa-th-list:before { + content: "\f00b"; +} +.fa-check:before { + content: "\f00c"; +} +.fa-remove:before, +.fa-close:before, +.fa-times:before { + content: "\f00d"; +} +.fa-search-plus:before { + content: "\f00e"; +} +.fa-search-minus:before { + content: "\f010"; +} +.fa-power-off:before { + content: "\f011"; +} +.fa-signal:before { + content: "\f012"; +} +.fa-gear:before, +.fa-cog:before { + content: "\f013"; +} +.fa-trash-o:before { + content: "\f014"; +} +.fa-home:before { + content: "\f015"; +} +.fa-file-o:before { + content: "\f016"; +} +.fa-clock-o:before { + content: "\f017"; +} +.fa-road:before { + content: "\f018"; +} +.fa-download:before { + content: "\f019"; +} +.fa-arrow-circle-o-down:before { + content: "\f01a"; +} +.fa-arrow-circle-o-up:before { + content: "\f01b"; +} +.fa-inbox:before { + content: "\f01c"; +} +.fa-play-circle-o:before { + content: "\f01d"; +} +.fa-rotate-right:before, +.fa-repeat:before { + content: "\f01e"; +} +.fa-refresh:before { + content: "\f021"; +} +.fa-list-alt:before { + content: "\f022"; +} +.fa-lock:before { + content: "\f023"; +} +.fa-flag:before { + content: "\f024"; +} +.fa-headphones:before { + content: "\f025"; +} +.fa-volume-off:before { + content: "\f026"; +} +.fa-volume-down:before { + content: "\f027"; +} +.fa-volume-up:before { + content: "\f028"; +} +.fa-qrcode:before { + content: "\f029"; +} +.fa-barcode:before { + content: "\f02a"; +} +.fa-tag:before { + content: "\f02b"; +} +.fa-tags:before { + content: "\f02c"; +} +.fa-book:before { + content: "\f02d"; +} +.fa-bookmark:before { + content: "\f02e"; +} +.fa-print:before { + content: "\f02f"; +} +.fa-camera:before { + content: "\f030"; +} +.fa-font:before { + content: "\f031"; +} +.fa-bold:before { + content: "\f032"; +} +.fa-italic:before { + content: "\f033"; +} +.fa-text-height:before { + content: "\f034"; +} +.fa-text-width:before { + content: "\f035"; +} +.fa-align-left:before { + content: "\f036"; +} +.fa-align-center:before { + content: "\f037"; +} +.fa-align-right:before { + content: "\f038"; +} +.fa-align-justify:before { + content: "\f039"; +} +.fa-list:before { + content: "\f03a"; +} +.fa-dedent:before, +.fa-outdent:before { + content: "\f03b"; +} +.fa-indent:before { + content: "\f03c"; +} +.fa-video-camera:before { + content: "\f03d"; +} +.fa-photo:before, +.fa-image:before, +.fa-picture-o:before { + content: "\f03e"; +} +.fa-pencil:before { + content: "\f040"; +} +.fa-map-marker:before { + content: "\f041"; +} +.fa-adjust:before { + content: "\f042"; +} +.fa-tint:before { + content: "\f043"; +} +.fa-edit:before, +.fa-pencil-square-o:before { + content: "\f044"; +} +.fa-share-square-o:before { + content: "\f045"; +} +.fa-check-square-o:before { + content: "\f046"; +} +.fa-arrows:before { + content: "\f047"; +} +.fa-step-backward:before { + content: "\f048"; +} +.fa-fast-backward:before { + content: "\f049"; +} +.fa-backward:before { + content: "\f04a"; +} +.fa-play:before { + content: "\f04b"; +} +.fa-pause:before { + content: "\f04c"; +} +.fa-stop:before { + content: "\f04d"; +} +.fa-forward:before { + content: "\f04e"; +} +.fa-fast-forward:before { + content: "\f050"; +} +.fa-step-forward:before { + content: "\f051"; +} +.fa-eject:before { + content: "\f052"; +} +.fa-chevron-left:before { + content: "\f053"; +} +.fa-chevron-right:before { + content: "\f054"; +} +.fa-plus-circle:before { + content: "\f055"; +} +.fa-minus-circle:before { + content: "\f056"; +} +.fa-times-circle:before { + content: "\f057"; +} +.fa-check-circle:before { + content: "\f058"; +} +.fa-question-circle:before { + content: "\f059"; +} +.fa-info-circle:before { + content: "\f05a"; +} +.fa-crosshairs:before { + content: "\f05b"; +} +.fa-times-circle-o:before { + content: "\f05c"; +} +.fa-check-circle-o:before { + content: "\f05d"; +} +.fa-ban:before { + content: "\f05e"; +} +.fa-arrow-left:before { + content: "\f060"; +} +.fa-arrow-right:before { + content: "\f061"; +} +.fa-arrow-up:before { + content: "\f062"; +} +.fa-arrow-down:before { + content: "\f063"; +} +.fa-mail-forward:before, +.fa-share:before { + content: "\f064"; +} +.fa-expand:before { + content: "\f065"; +} +.fa-compress:before { + content: "\f066"; +} +.fa-plus:before { + content: "\f067"; +} +.fa-minus:before { + content: "\f068"; +} +.fa-asterisk:before { + content: "\f069"; +} +.fa-exclamation-circle:before { + content: "\f06a"; +} +.fa-gift:before { + content: "\f06b"; +} +.fa-leaf:before { + content: "\f06c"; +} +.fa-fire:before { + content: "\f06d"; +} +.fa-eye:before { + content: "\f06e"; +} +.fa-eye-slash:before { + content: "\f070"; +} +.fa-warning:before, +.fa-exclamation-triangle:before { + content: "\f071"; +} +.fa-plane:before { + content: "\f072"; +} +.fa-calendar:before { + content: "\f073"; +} +.fa-random:before { + content: "\f074"; +} +.fa-comment:before { + content: "\f075"; +} +.fa-magnet:before { + content: "\f076"; +} +.fa-chevron-up:before { + content: "\f077"; +} +.fa-chevron-down:before { + content: "\f078"; +} +.fa-retweet:before { + content: "\f079"; +} +.fa-shopping-cart:before { + content: "\f07a"; +} +.fa-folder:before { + content: "\f07b"; +} +.fa-folder-open:before { + content: "\f07c"; +} +.fa-arrows-v:before { + content: "\f07d"; +} +.fa-arrows-h:before { + content: "\f07e"; +} +.fa-bar-chart-o:before, +.fa-bar-chart:before { + content: "\f080"; +} +.fa-twitter-square:before { + content: "\f081"; +} +.fa-facebook-square:before { + content: "\f082"; +} +.fa-camera-retro:before { + content: "\f083"; +} +.fa-key:before { + content: "\f084"; +} +.fa-gears:before, +.fa-cogs:before { + content: "\f085"; +} +.fa-comments:before { + content: "\f086"; +} +.fa-thumbs-o-up:before { + content: "\f087"; +} +.fa-thumbs-o-down:before { + content: "\f088"; +} +.fa-star-half:before { + content: "\f089"; +} +.fa-heart-o:before { + content: "\f08a"; +} +.fa-sign-out:before { + content: "\f08b"; +} +.fa-linkedin-square:before { + content: "\f08c"; +} +.fa-thumb-tack:before { + content: "\f08d"; +} +.fa-external-link:before { + content: "\f08e"; +} +.fa-sign-in:before { + content: "\f090"; +} +.fa-trophy:before { + content: "\f091"; +} +.fa-github-square:before { + content: "\f092"; +} +.fa-upload:before { + content: "\f093"; +} +.fa-lemon-o:before { + content: "\f094"; +} +.fa-phone:before { + content: "\f095"; +} +.fa-square-o:before { + content: "\f096"; +} +.fa-bookmark-o:before { + content: "\f097"; +} +.fa-phone-square:before { + content: "\f098"; +} +.fa-twitter:before { + content: "\f099"; +} +.fa-facebook-f:before, +.fa-facebook:before { + content: "\f09a"; +} +.fa-github:before { + content: "\f09b"; +} +.fa-unlock:before { + content: "\f09c"; +} +.fa-credit-card:before { + content: "\f09d"; +} +.fa-feed:before, +.fa-rss:before { + content: "\f09e"; +} +.fa-hdd-o:before { + content: "\f0a0"; +} +.fa-bullhorn:before { + content: "\f0a1"; +} +.fa-bell:before { + content: "\f0f3"; +} +.fa-certificate:before { + content: "\f0a3"; +} +.fa-hand-o-right:before { + content: "\f0a4"; +} +.fa-hand-o-left:before { + content: "\f0a5"; +} +.fa-hand-o-up:before { + content: "\f0a6"; +} +.fa-hand-o-down:before { + content: "\f0a7"; +} +.fa-arrow-circle-left:before { + content: "\f0a8"; +} +.fa-arrow-circle-right:before { + content: "\f0a9"; +} +.fa-arrow-circle-up:before { + content: "\f0aa"; +} +.fa-arrow-circle-down:before { + content: "\f0ab"; +} +.fa-globe:before { + content: "\f0ac"; +} +.fa-wrench:before { + content: "\f0ad"; +} +.fa-tasks:before { + content: "\f0ae"; +} +.fa-filter:before { + content: "\f0b0"; +} +.fa-briefcase:before { + content: "\f0b1"; +} +.fa-arrows-alt:before { + content: "\f0b2"; +} +.fa-group:before, +.fa-users:before { + content: "\f0c0"; +} +.fa-chain:before, +.fa-link:before { + content: "\f0c1"; +} +.fa-cloud:before { + content: "\f0c2"; +} +.fa-flask:before { + content: "\f0c3"; +} +.fa-cut:before, +.fa-scissors:before { + content: "\f0c4"; +} +.fa-copy:before, +.fa-files-o:before { + content: "\f0c5"; +} +.fa-paperclip:before { + content: "\f0c6"; +} +.fa-save:before, +.fa-floppy-o:before { + content: "\f0c7"; +} +.fa-square:before { + content: "\f0c8"; +} +.fa-navicon:before, +.fa-reorder:before, +.fa-bars:before { + content: "\f0c9"; +} +.fa-list-ul:before { + content: "\f0ca"; +} +.fa-list-ol:before { + content: "\f0cb"; +} +.fa-strikethrough:before { + content: "\f0cc"; +} +.fa-underline:before { + content: "\f0cd"; +} +.fa-table:before { + content: "\f0ce"; +} +.fa-magic:before { + content: "\f0d0"; +} +.fa-truck:before { + content: "\f0d1"; +} +.fa-pinterest:before { + content: "\f0d2"; +} +.fa-pinterest-square:before { + content: "\f0d3"; +} +.fa-google-plus-square:before { + content: "\f0d4"; +} +.fa-google-plus:before { + content: "\f0d5"; +} +.fa-money:before { + content: "\f0d6"; +} +.fa-caret-down:before { + content: "\f0d7"; +} +.fa-caret-up:before { + content: "\f0d8"; +} +.fa-caret-left:before { + content: "\f0d9"; +} +.fa-caret-right:before { + content: "\f0da"; +} +.fa-columns:before { + content: "\f0db"; +} +.fa-unsorted:before, +.fa-sort:before { + content: "\f0dc"; +} +.fa-sort-down:before, +.fa-sort-desc:before { + content: "\f0dd"; +} +.fa-sort-up:before, +.fa-sort-asc:before { + content: "\f0de"; +} +.fa-envelope:before { + content: "\f0e0"; +} +.fa-linkedin:before { + content: "\f0e1"; +} +.fa-rotate-left:before, +.fa-undo:before { + content: "\f0e2"; +} +.fa-legal:before, +.fa-gavel:before { + content: "\f0e3"; +} +.fa-dashboard:before, +.fa-tachometer:before { + content: "\f0e4"; +} +.fa-comment-o:before { + content: "\f0e5"; +} +.fa-comments-o:before { + content: "\f0e6"; +} +.fa-flash:before, +.fa-bolt:before { + content: "\f0e7"; +} +.fa-sitemap:before { + content: "\f0e8"; +} +.fa-umbrella:before { + content: "\f0e9"; +} +.fa-paste:before, +.fa-clipboard:before { + content: "\f0ea"; +} +.fa-lightbulb-o:before { + content: "\f0eb"; +} +.fa-exchange:before { + content: "\f0ec"; +} +.fa-cloud-download:before { + content: "\f0ed"; +} +.fa-cloud-upload:before { + content: "\f0ee"; +} +.fa-user-md:before { + content: "\f0f0"; +} +.fa-stethoscope:before { + content: "\f0f1"; +} +.fa-suitcase:before { + content: "\f0f2"; +} +.fa-bell-o:before { + content: "\f0a2"; +} +.fa-coffee:before { + content: "\f0f4"; +} +.fa-cutlery:before { + content: "\f0f5"; +} +.fa-file-text-o:before { + content: "\f0f6"; +} +.fa-building-o:before { + content: "\f0f7"; +} +.fa-hospital-o:before { + content: "\f0f8"; +} +.fa-ambulance:before { + content: "\f0f9"; +} +.fa-medkit:before { + content: "\f0fa"; +} +.fa-fighter-jet:before { + content: "\f0fb"; +} +.fa-beer:before { + content: "\f0fc"; +} +.fa-h-square:before { + content: "\f0fd"; +} +.fa-plus-square:before { + content: "\f0fe"; +} +.fa-angle-double-left:before { + content: "\f100"; +} +.fa-angle-double-right:before { + content: "\f101"; +} +.fa-angle-double-up:before { + content: "\f102"; +} +.fa-angle-double-down:before { + content: "\f103"; +} +.fa-angle-left:before { + content: "\f104"; +} +.fa-angle-right:before { + content: "\f105"; +} +.fa-angle-up:before { + content: "\f106"; +} +.fa-angle-down:before { + content: "\f107"; +} +.fa-desktop:before { + content: "\f108"; +} +.fa-laptop:before { + content: "\f109"; +} +.fa-tablet:before { + content: "\f10a"; +} +.fa-mobile-phone:before, +.fa-mobile:before { + content: "\f10b"; +} +.fa-circle-o:before { + content: "\f10c"; +} +.fa-quote-left:before { + content: "\f10d"; +} +.fa-quote-right:before { + content: "\f10e"; +} +.fa-spinner:before { + content: "\f110"; +} +.fa-circle:before { + content: "\f111"; +} +.fa-mail-reply:before, +.fa-reply:before { + content: "\f112"; +} +.fa-github-alt:before { + content: "\f113"; +} +.fa-folder-o:before { + content: "\f114"; +} +.fa-folder-open-o:before { + content: "\f115"; +} +.fa-smile-o:before { + content: "\f118"; +} +.fa-frown-o:before { + content: "\f119"; +} +.fa-meh-o:before { + content: "\f11a"; +} +.fa-gamepad:before { + content: "\f11b"; +} +.fa-keyboard-o:before { + content: "\f11c"; +} +.fa-flag-o:before { + content: "\f11d"; +} +.fa-flag-checkered:before { + content: "\f11e"; +} +.fa-terminal:before { + content: "\f120"; +} +.fa-code:before { + content: "\f121"; +} +.fa-mail-reply-all:before, +.fa-reply-all:before { + content: "\f122"; +} +.fa-star-half-empty:before, +.fa-star-half-full:before, +.fa-star-half-o:before { + content: "\f123"; +} +.fa-location-arrow:before { + content: "\f124"; +} +.fa-crop:before { + content: "\f125"; +} +.fa-code-fork:before { + content: "\f126"; +} +.fa-unlink:before, +.fa-chain-broken:before { + content: "\f127"; +} +.fa-question:before { + content: "\f128"; +} +.fa-info:before { + content: "\f129"; +} +.fa-exclamation:before { + content: "\f12a"; +} +.fa-superscript:before { + content: "\f12b"; +} +.fa-subscript:before { + content: "\f12c"; +} +.fa-eraser:before { + content: "\f12d"; +} +.fa-puzzle-piece:before { + content: "\f12e"; +} +.fa-microphone:before { + content: "\f130"; +} +.fa-microphone-slash:before { + content: "\f131"; +} +.fa-shield:before { + content: "\f132"; +} +.fa-calendar-o:before { + content: "\f133"; +} +.fa-fire-extinguisher:before { + content: "\f134"; +} +.fa-rocket:before { + content: "\f135"; +} +.fa-maxcdn:before { + content: "\f136"; +} +.fa-chevron-circle-left:before { + content: "\f137"; +} +.fa-chevron-circle-right:before { + content: "\f138"; +} +.fa-chevron-circle-up:before { + content: "\f139"; +} +.fa-chevron-circle-down:before { + content: "\f13a"; +} +.fa-html5:before { + content: "\f13b"; +} +.fa-css3:before { + content: "\f13c"; +} +.fa-anchor:before { + content: "\f13d"; +} +.fa-unlock-alt:before { + content: "\f13e"; +} +.fa-bullseye:before { + content: "\f140"; +} +.fa-ellipsis-h:before { + content: "\f141"; +} +.fa-ellipsis-v:before { + content: "\f142"; +} +.fa-rss-square:before { + content: "\f143"; +} +.fa-play-circle:before { + content: "\f144"; +} +.fa-ticket:before { + content: "\f145"; +} +.fa-minus-square:before { + content: "\f146"; +} +.fa-minus-square-o:before { + content: "\f147"; +} +.fa-level-up:before { + content: "\f148"; +} +.fa-level-down:before { + content: "\f149"; +} +.fa-check-square:before { + content: "\f14a"; +} +.fa-pencil-square:before { + content: "\f14b"; +} +.fa-external-link-square:before { + content: "\f14c"; +} +.fa-share-square:before { + content: "\f14d"; +} +.fa-compass:before { + content: "\f14e"; +} +.fa-toggle-down:before, +.fa-caret-square-o-down:before { + content: "\f150"; +} +.fa-toggle-up:before, +.fa-caret-square-o-up:before { + content: "\f151"; +} +.fa-toggle-right:before, +.fa-caret-square-o-right:before { + content: "\f152"; +} +.fa-euro:before, +.fa-eur:before { + content: "\f153"; +} +.fa-gbp:before { + content: "\f154"; +} +.fa-dollar:before, +.fa-usd:before { + content: "\f155"; +} +.fa-rupee:before, +.fa-inr:before { + content: "\f156"; +} +.fa-cny:before, +.fa-rmb:before, +.fa-yen:before, +.fa-jpy:before { + content: "\f157"; +} +.fa-ruble:before, +.fa-rouble:before, +.fa-rub:before { + content: "\f158"; +} +.fa-won:before, +.fa-krw:before { + content: "\f159"; +} +.fa-bitcoin:before, +.fa-btc:before { + content: "\f15a"; +} +.fa-file:before { + content: "\f15b"; +} +.fa-file-text:before { + content: "\f15c"; +} +.fa-sort-alpha-asc:before { + content: "\f15d"; +} +.fa-sort-alpha-desc:before { + content: "\f15e"; +} +.fa-sort-amount-asc:before { + content: "\f160"; +} +.fa-sort-amount-desc:before { + content: "\f161"; +} +.fa-sort-numeric-asc:before { + content: "\f162"; +} +.fa-sort-numeric-desc:before { + content: "\f163"; +} +.fa-thumbs-up:before { + content: "\f164"; +} +.fa-thumbs-down:before { + content: "\f165"; +} +.fa-youtube-square:before { + content: "\f166"; +} +.fa-youtube:before { + content: "\f167"; +} +.fa-xing:before { + content: "\f168"; +} +.fa-xing-square:before { + content: "\f169"; +} +.fa-youtube-play:before { + content: "\f16a"; +} +.fa-dropbox:before { + content: "\f16b"; +} +.fa-stack-overflow:before { + content: "\f16c"; +} +.fa-instagram:before { + content: "\f16d"; +} +.fa-flickr:before { + content: "\f16e"; +} +.fa-adn:before { + content: "\f170"; +} +.fa-bitbucket:before { + content: "\f171"; +} +.fa-bitbucket-square:before { + content: "\f172"; +} +.fa-tumblr:before { + content: "\f173"; +} +.fa-tumblr-square:before { + content: "\f174"; +} +.fa-long-arrow-down:before { + content: "\f175"; +} +.fa-long-arrow-up:before { + content: "\f176"; +} +.fa-long-arrow-left:before { + content: "\f177"; +} +.fa-long-arrow-right:before { + content: "\f178"; +} +.fa-apple:before { + content: "\f179"; +} +.fa-windows:before { + content: "\f17a"; +} +.fa-android:before { + content: "\f17b"; +} +.fa-linux:before { + content: "\f17c"; +} +.fa-dribbble:before { + content: "\f17d"; +} +.fa-skype:before { + content: "\f17e"; +} +.fa-foursquare:before { + content: "\f180"; +} +.fa-trello:before { + content: "\f181"; +} +.fa-female:before { + content: "\f182"; +} +.fa-male:before { + content: "\f183"; +} +.fa-gittip:before, +.fa-gratipay:before { + content: "\f184"; +} +.fa-sun-o:before { + content: "\f185"; +} +.fa-moon-o:before { + content: "\f186"; +} +.fa-archive:before { + content: "\f187"; +} +.fa-bug:before { + content: "\f188"; +} +.fa-vk:before { + content: "\f189"; +} +.fa-weibo:before { + content: "\f18a"; +} +.fa-renren:before { + content: "\f18b"; +} +.fa-pagelines:before { + content: "\f18c"; +} +.fa-stack-exchange:before { + content: "\f18d"; +} +.fa-arrow-circle-o-right:before { + content: "\f18e"; +} +.fa-arrow-circle-o-left:before { + content: "\f190"; +} +.fa-toggle-left:before, +.fa-caret-square-o-left:before { + content: "\f191"; +} +.fa-dot-circle-o:before { + content: "\f192"; +} +.fa-wheelchair:before { + content: "\f193"; +} +.fa-vimeo-square:before { + content: "\f194"; +} +.fa-turkish-lira:before, +.fa-try:before { + content: "\f195"; +} +.fa-plus-square-o:before { + content: "\f196"; +} +.fa-space-shuttle:before { + content: "\f197"; +} +.fa-slack:before { + content: "\f198"; +} +.fa-envelope-square:before { + content: "\f199"; +} +.fa-wordpress:before { + content: "\f19a"; +} +.fa-openid:before { + content: "\f19b"; +} +.fa-institution:before, +.fa-bank:before, +.fa-university:before { + content: "\f19c"; +} +.fa-mortar-board:before, +.fa-graduation-cap:before { + content: "\f19d"; +} +.fa-yahoo:before { + content: "\f19e"; +} +.fa-google:before { + content: "\f1a0"; +} +.fa-reddit:before { + content: "\f1a1"; +} +.fa-reddit-square:before { + content: "\f1a2"; +} +.fa-stumbleupon-circle:before { + content: "\f1a3"; +} +.fa-stumbleupon:before { + content: "\f1a4"; +} +.fa-delicious:before { + content: "\f1a5"; +} +.fa-digg:before { + content: "\f1a6"; +} +.fa-pied-piper-pp:before { + content: "\f1a7"; +} +.fa-pied-piper-alt:before { + content: "\f1a8"; +} +.fa-drupal:before { + content: "\f1a9"; +} +.fa-joomla:before { + content: "\f1aa"; +} +.fa-language:before { + content: "\f1ab"; +} +.fa-fax:before { + content: "\f1ac"; +} +.fa-building:before { + content: "\f1ad"; +} +.fa-child:before { + content: "\f1ae"; +} +.fa-paw:before { + content: "\f1b0"; +} +.fa-spoon:before { + content: "\f1b1"; +} +.fa-cube:before { + content: "\f1b2"; +} +.fa-cubes:before { + content: "\f1b3"; +} +.fa-behance:before { + content: "\f1b4"; +} +.fa-behance-square:before { + content: "\f1b5"; +} +.fa-steam:before { + content: "\f1b6"; +} +.fa-steam-square:before { + content: "\f1b7"; +} +.fa-recycle:before { + content: "\f1b8"; +} +.fa-automobile:before, +.fa-car:before { + content: "\f1b9"; +} +.fa-cab:before, +.fa-taxi:before { + content: "\f1ba"; +} +.fa-tree:before { + content: "\f1bb"; +} +.fa-spotify:before { + content: "\f1bc"; +} +.fa-deviantart:before { + content: "\f1bd"; +} +.fa-soundcloud:before { + content: "\f1be"; +} +.fa-database:before { + content: "\f1c0"; +} +.fa-file-pdf-o:before { + content: "\f1c1"; +} +.fa-file-word-o:before { + content: "\f1c2"; +} +.fa-file-excel-o:before { + content: "\f1c3"; +} +.fa-file-powerpoint-o:before { + content: "\f1c4"; +} +.fa-file-photo-o:before, +.fa-file-picture-o:before, +.fa-file-image-o:before { + content: "\f1c5"; +} +.fa-file-zip-o:before, +.fa-file-archive-o:before { + content: "\f1c6"; +} +.fa-file-sound-o:before, +.fa-file-audio-o:before { + content: "\f1c7"; +} +.fa-file-movie-o:before, +.fa-file-video-o:before { + content: "\f1c8"; +} +.fa-file-code-o:before { + content: "\f1c9"; +} +.fa-vine:before { + content: "\f1ca"; +} +.fa-codepen:before { + content: "\f1cb"; +} +.fa-jsfiddle:before { + content: "\f1cc"; +} +.fa-life-bouy:before, +.fa-life-buoy:before, +.fa-life-saver:before, +.fa-support:before, +.fa-life-ring:before { + content: "\f1cd"; +} +.fa-circle-o-notch:before { + content: "\f1ce"; +} +.fa-ra:before, +.fa-resistance:before, +.fa-rebel:before { + content: "\f1d0"; +} +.fa-ge:before, +.fa-empire:before { + content: "\f1d1"; +} +.fa-git-square:before { + content: "\f1d2"; +} +.fa-git:before { + content: "\f1d3"; +} +.fa-y-combinator-square:before, +.fa-yc-square:before, +.fa-hacker-news:before { + content: "\f1d4"; +} +.fa-tencent-weibo:before { + content: "\f1d5"; +} +.fa-qq:before { + content: "\f1d6"; +} +.fa-wechat:before, +.fa-weixin:before { + content: "\f1d7"; +} +.fa-send:before, +.fa-paper-plane:before { + content: "\f1d8"; +} +.fa-send-o:before, +.fa-paper-plane-o:before { + content: "\f1d9"; +} +.fa-history:before { + content: "\f1da"; +} +.fa-circle-thin:before { + content: "\f1db"; +} +.fa-header:before { + content: "\f1dc"; +} +.fa-paragraph:before { + content: "\f1dd"; +} +.fa-sliders:before { + content: "\f1de"; +} +.fa-share-alt:before { + content: "\f1e0"; +} +.fa-share-alt-square:before { + content: "\f1e1"; +} +.fa-bomb:before { + content: "\f1e2"; +} +.fa-soccer-ball-o:before, +.fa-futbol-o:before { + content: "\f1e3"; +} +.fa-tty:before { + content: "\f1e4"; +} +.fa-binoculars:before { + content: "\f1e5"; +} +.fa-plug:before { + content: "\f1e6"; +} +.fa-slideshare:before { + content: "\f1e7"; +} +.fa-twitch:before { + content: "\f1e8"; +} +.fa-yelp:before { + content: "\f1e9"; +} +.fa-newspaper-o:before { + content: "\f1ea"; +} +.fa-wifi:before { + content: "\f1eb"; +} +.fa-calculator:before { + content: "\f1ec"; +} +.fa-paypal:before { + content: "\f1ed"; +} +.fa-google-wallet:before { + content: "\f1ee"; +} +.fa-cc-visa:before { + content: "\f1f0"; +} +.fa-cc-mastercard:before { + content: "\f1f1"; +} +.fa-cc-discover:before { + content: "\f1f2"; +} +.fa-cc-amex:before { + content: "\f1f3"; +} +.fa-cc-paypal:before { + content: "\f1f4"; +} +.fa-cc-stripe:before { + content: "\f1f5"; +} +.fa-bell-slash:before { + content: "\f1f6"; +} +.fa-bell-slash-o:before { + content: "\f1f7"; +} +.fa-trash:before { + content: "\f1f8"; +} +.fa-copyright:before { + content: "\f1f9"; +} +.fa-at:before { + content: "\f1fa"; +} +.fa-eyedropper:before { + content: "\f1fb"; +} +.fa-paint-brush:before { + content: "\f1fc"; +} +.fa-birthday-cake:before { + content: "\f1fd"; +} +.fa-area-chart:before { + content: "\f1fe"; +} +.fa-pie-chart:before { + content: "\f200"; +} +.fa-line-chart:before { + content: "\f201"; +} +.fa-lastfm:before { + content: "\f202"; +} +.fa-lastfm-square:before { + content: "\f203"; +} +.fa-toggle-off:before { + content: "\f204"; +} +.fa-toggle-on:before { + content: "\f205"; +} +.fa-bicycle:before { + content: "\f206"; +} +.fa-bus:before { + content: "\f207"; +} +.fa-ioxhost:before { + content: "\f208"; +} +.fa-angellist:before { + content: "\f209"; +} +.fa-cc:before { + content: "\f20a"; +} +.fa-shekel:before, +.fa-sheqel:before, +.fa-ils:before { + content: "\f20b"; +} +.fa-meanpath:before { + content: "\f20c"; +} +.fa-buysellads:before { + content: "\f20d"; +} +.fa-connectdevelop:before { + content: "\f20e"; +} +.fa-dashcube:before { + content: "\f210"; +} +.fa-forumbee:before { + content: "\f211"; +} +.fa-leanpub:before { + content: "\f212"; +} +.fa-sellsy:before { + content: "\f213"; +} +.fa-shirtsinbulk:before { + content: "\f214"; +} +.fa-simplybuilt:before { + content: "\f215"; +} +.fa-skyatlas:before { + content: "\f216"; +} +.fa-cart-plus:before { + content: "\f217"; +} +.fa-cart-arrow-down:before { + content: "\f218"; +} +.fa-diamond:before { + content: "\f219"; +} +.fa-ship:before { + content: "\f21a"; +} +.fa-user-secret:before { + content: "\f21b"; +} +.fa-motorcycle:before { + content: "\f21c"; +} +.fa-street-view:before { + content: "\f21d"; +} +.fa-heartbeat:before { + content: "\f21e"; +} +.fa-venus:before { + content: "\f221"; +} +.fa-mars:before { + content: "\f222"; +} +.fa-mercury:before { + content: "\f223"; +} +.fa-intersex:before, +.fa-transgender:before { + content: "\f224"; +} +.fa-transgender-alt:before { + content: "\f225"; +} +.fa-venus-double:before { + content: "\f226"; +} +.fa-mars-double:before { + content: "\f227"; +} +.fa-venus-mars:before { + content: "\f228"; +} +.fa-mars-stroke:before { + content: "\f229"; +} +.fa-mars-stroke-v:before { + content: "\f22a"; +} +.fa-mars-stroke-h:before { + content: "\f22b"; +} +.fa-neuter:before { + content: "\f22c"; +} +.fa-genderless:before { + content: "\f22d"; +} +.fa-facebook-official:before { + content: "\f230"; +} +.fa-pinterest-p:before { + content: "\f231"; +} +.fa-whatsapp:before { + content: "\f232"; +} +.fa-server:before { + content: "\f233"; +} +.fa-user-plus:before { + content: "\f234"; +} +.fa-user-times:before { + content: "\f235"; +} +.fa-hotel:before, +.fa-bed:before { + content: "\f236"; +} +.fa-viacoin:before { + content: "\f237"; +} +.fa-train:before { + content: "\f238"; +} +.fa-subway:before { + content: "\f239"; +} +.fa-medium:before { + content: "\f23a"; +} +.fa-yc:before, +.fa-y-combinator:before { + content: "\f23b"; +} +.fa-optin-monster:before { + content: "\f23c"; +} +.fa-opencart:before { + content: "\f23d"; +} +.fa-expeditedssl:before { + content: "\f23e"; +} +.fa-battery-4:before, +.fa-battery:before, +.fa-battery-full:before { + content: "\f240"; +} +.fa-battery-3:before, +.fa-battery-three-quarters:before { + content: "\f241"; +} +.fa-battery-2:before, +.fa-battery-half:before { + content: "\f242"; +} +.fa-battery-1:before, +.fa-battery-quarter:before { + content: "\f243"; +} +.fa-battery-0:before, +.fa-battery-empty:before { + content: "\f244"; +} +.fa-mouse-pointer:before { + content: "\f245"; +} +.fa-i-cursor:before { + content: "\f246"; +} +.fa-object-group:before { + content: "\f247"; +} +.fa-object-ungroup:before { + content: "\f248"; +} +.fa-sticky-note:before { + content: "\f249"; +} +.fa-sticky-note-o:before { + content: "\f24a"; +} +.fa-cc-jcb:before { + content: "\f24b"; +} +.fa-cc-diners-club:before { + content: "\f24c"; +} +.fa-clone:before { + content: "\f24d"; +} +.fa-balance-scale:before { + content: "\f24e"; +} +.fa-hourglass-o:before { + content: "\f250"; +} +.fa-hourglass-1:before, +.fa-hourglass-start:before { + content: "\f251"; +} +.fa-hourglass-2:before, +.fa-hourglass-half:before { + content: "\f252"; +} +.fa-hourglass-3:before, +.fa-hourglass-end:before { + content: "\f253"; +} +.fa-hourglass:before { + content: "\f254"; +} +.fa-hand-grab-o:before, +.fa-hand-rock-o:before { + content: "\f255"; +} +.fa-hand-stop-o:before, +.fa-hand-paper-o:before { + content: "\f256"; +} +.fa-hand-scissors-o:before { + content: "\f257"; +} +.fa-hand-lizard-o:before { + content: "\f258"; +} +.fa-hand-spock-o:before { + content: "\f259"; +} +.fa-hand-pointer-o:before { + content: "\f25a"; +} +.fa-hand-peace-o:before { + content: "\f25b"; +} +.fa-trademark:before { + content: "\f25c"; +} +.fa-registered:before { + content: "\f25d"; +} +.fa-creative-commons:before { + content: "\f25e"; +} +.fa-gg:before { + content: "\f260"; +} +.fa-gg-circle:before { + content: "\f261"; +} +.fa-tripadvisor:before { + content: "\f262"; +} +.fa-odnoklassniki:before { + content: "\f263"; +} +.fa-odnoklassniki-square:before { + content: "\f264"; +} +.fa-get-pocket:before { + content: "\f265"; +} +.fa-wikipedia-w:before { + content: "\f266"; +} +.fa-safari:before { + content: "\f267"; +} +.fa-chrome:before { + content: "\f268"; +} +.fa-firefox:before { + content: "\f269"; +} +.fa-opera:before { + content: "\f26a"; +} +.fa-internet-explorer:before { + content: "\f26b"; +} +.fa-tv:before, +.fa-television:before { + content: "\f26c"; +} +.fa-contao:before { + content: "\f26d"; +} +.fa-500px:before { + content: "\f26e"; +} +.fa-amazon:before { + content: "\f270"; +} +.fa-calendar-plus-o:before { + content: "\f271"; +} +.fa-calendar-minus-o:before { + content: "\f272"; +} +.fa-calendar-times-o:before { + content: "\f273"; +} +.fa-calendar-check-o:before { + content: "\f274"; +} +.fa-industry:before { + content: "\f275"; +} +.fa-map-pin:before { + content: "\f276"; +} +.fa-map-signs:before { + content: "\f277"; +} +.fa-map-o:before { + content: "\f278"; +} +.fa-map:before { + content: "\f279"; +} +.fa-commenting:before { + content: "\f27a"; +} +.fa-commenting-o:before { + content: "\f27b"; +} +.fa-houzz:before { + content: "\f27c"; +} +.fa-vimeo:before { + content: "\f27d"; +} +.fa-black-tie:before { + content: "\f27e"; +} +.fa-fonticons:before { + content: "\f280"; +} +.fa-reddit-alien:before { + content: "\f281"; +} +.fa-edge:before { + content: "\f282"; +} +.fa-credit-card-alt:before { + content: "\f283"; +} +.fa-codiepie:before { + content: "\f284"; +} +.fa-modx:before { + content: "\f285"; +} +.fa-fort-awesome:before { + content: "\f286"; +} +.fa-usb:before { + content: "\f287"; +} +.fa-product-hunt:before { + content: "\f288"; +} +.fa-mixcloud:before { + content: "\f289"; +} +.fa-scribd:before { + content: "\f28a"; +} +.fa-pause-circle:before { + content: "\f28b"; +} +.fa-pause-circle-o:before { + content: "\f28c"; +} +.fa-stop-circle:before { + content: "\f28d"; +} +.fa-stop-circle-o:before { + content: "\f28e"; +} +.fa-shopping-bag:before { + content: "\f290"; +} +.fa-shopping-basket:before { + content: "\f291"; +} +.fa-hashtag:before { + content: "\f292"; +} +.fa-bluetooth:before { + content: "\f293"; +} +.fa-bluetooth-b:before { + content: "\f294"; +} +.fa-percent:before { + content: "\f295"; +} +.fa-gitlab:before { + content: "\f296"; +} +.fa-wpbeginner:before { + content: "\f297"; +} +.fa-wpforms:before { + content: "\f298"; +} +.fa-envira:before { + content: "\f299"; +} +.fa-universal-access:before { + content: "\f29a"; +} +.fa-wheelchair-alt:before { + content: "\f29b"; +} +.fa-question-circle-o:before { + content: "\f29c"; +} +.fa-blind:before { + content: "\f29d"; +} +.fa-audio-description:before { + content: "\f29e"; +} +.fa-volume-control-phone:before { + content: "\f2a0"; +} +.fa-braille:before { + content: "\f2a1"; +} +.fa-assistive-listening-systems:before { + content: "\f2a2"; +} +.fa-asl-interpreting:before, +.fa-american-sign-language-interpreting:before { + content: "\f2a3"; +} +.fa-deafness:before, +.fa-hard-of-hearing:before, +.fa-deaf:before { + content: "\f2a4"; +} +.fa-glide:before { + content: "\f2a5"; +} +.fa-glide-g:before { + content: "\f2a6"; +} +.fa-signing:before, +.fa-sign-language:before { + content: "\f2a7"; +} +.fa-low-vision:before { + content: "\f2a8"; +} +.fa-viadeo:before { + content: "\f2a9"; +} +.fa-viadeo-square:before { + content: "\f2aa"; +} +.fa-snapchat:before { + content: "\f2ab"; +} +.fa-snapchat-ghost:before { + content: "\f2ac"; +} +.fa-snapchat-square:before { + content: "\f2ad"; +} +.fa-pied-piper:before { + content: "\f2ae"; +} +.fa-first-order:before { + content: "\f2b0"; +} +.fa-yoast:before { + content: "\f2b1"; +} +.fa-themeisle:before { + content: "\f2b2"; +} +.fa-google-plus-circle:before, +.fa-google-plus-official:before { + content: "\f2b3"; +} +.fa-fa:before, +.fa-font-awesome:before { + content: "\f2b4"; +} +.fa-handshake-o:before { + content: "\f2b5"; +} +.fa-envelope-open:before { + content: "\f2b6"; +} +.fa-envelope-open-o:before { + content: "\f2b7"; +} +.fa-linode:before { + content: "\f2b8"; +} +.fa-address-book:before { + content: "\f2b9"; +} +.fa-address-book-o:before { + content: "\f2ba"; +} +.fa-vcard:before, +.fa-address-card:before { + content: "\f2bb"; +} +.fa-vcard-o:before, +.fa-address-card-o:before { + content: "\f2bc"; +} +.fa-user-circle:before { + content: "\f2bd"; +} +.fa-user-circle-o:before { + content: "\f2be"; +} +.fa-user-o:before { + content: "\f2c0"; +} +.fa-id-badge:before { + content: "\f2c1"; +} +.fa-drivers-license:before, +.fa-id-card:before { + content: "\f2c2"; +} +.fa-drivers-license-o:before, +.fa-id-card-o:before { + content: "\f2c3"; +} +.fa-quora:before { + content: "\f2c4"; +} +.fa-free-code-camp:before { + content: "\f2c5"; +} +.fa-telegram:before { + content: "\f2c6"; +} +.fa-thermometer-4:before, +.fa-thermometer:before, +.fa-thermometer-full:before { + content: "\f2c7"; +} +.fa-thermometer-3:before, +.fa-thermometer-three-quarters:before { + content: "\f2c8"; +} +.fa-thermometer-2:before, +.fa-thermometer-half:before { + content: "\f2c9"; +} +.fa-thermometer-1:before, +.fa-thermometer-quarter:before { + content: "\f2ca"; +} +.fa-thermometer-0:before, +.fa-thermometer-empty:before { + content: "\f2cb"; +} +.fa-shower:before { + content: "\f2cc"; +} +.fa-bathtub:before, +.fa-s15:before, +.fa-bath:before { + content: "\f2cd"; +} +.fa-podcast:before { + content: "\f2ce"; +} +.fa-window-maximize:before { + content: "\f2d0"; +} +.fa-window-minimize:before { + content: "\f2d1"; +} +.fa-window-restore:before { + content: "\f2d2"; +} +.fa-times-rectangle:before, +.fa-window-close:before { + content: "\f2d3"; +} +.fa-times-rectangle-o:before, +.fa-window-close-o:before { + content: "\f2d4"; +} +.fa-bandcamp:before { + content: "\f2d5"; +} +.fa-grav:before { + content: "\f2d6"; +} +.fa-etsy:before { + content: "\f2d7"; +} +.fa-imdb:before { + content: "\f2d8"; +} +.fa-ravelry:before { + content: "\f2d9"; +} +.fa-eercast:before { + content: "\f2da"; +} +.fa-microchip:before { + content: "\f2db"; +} +.fa-snowflake-o:before { + content: "\f2dc"; +} +.fa-superpowers:before { + content: "\f2dd"; +} +.fa-wpexplorer:before { + content: "\f2de"; +} +.fa-meetup:before { + content: "\f2e0"; +} +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} +.sr-only-focusable:active, +.sr-only-focusable:focus { + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; +} diff --git a/pagure/static/vendor/font-awesome/font-awesome/FontAwesome.otf b/pagure/static/vendor/font-awesome/font-awesome/FontAwesome.otf new file mode 100644 index 0000000..401ec0f Binary files /dev/null and b/pagure/static/vendor/font-awesome/font-awesome/FontAwesome.otf differ diff --git a/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.eot b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.eot new file mode 100644 index 0000000..e9f60ca Binary files /dev/null and b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.eot differ diff --git a/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.svg b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.svg new file mode 100644 index 0000000..855c845 --- /dev/null +++ b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.svg @@ -0,0 +1,2671 @@ + + + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.ttf b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.ttf differ diff --git a/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.woff b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.woff new file mode 100644 index 0000000..400014a Binary files /dev/null and b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.woff differ diff --git a/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.woff2 b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.woff2 new file mode 100644 index 0000000..4d13fc6 Binary files /dev/null and b/pagure/static/vendor/font-awesome/font-awesome/fontawesome-webfont.woff2 differ diff --git a/pagure/templates/_browseheader.html b/pagure/templates/_browseheader.html index b2e7dab..cd3bbbc 100644 --- a/pagure/templates/_browseheader.html +++ b/pagure/templates/_browseheader.html @@ -1,27 +1,15 @@ {% macro browse_header(select) -%} + +{% if select == 'projects' %}
-
- - - {% if select == 'projects' %} - - {% endif %} - - - -
+
+

Welcome to Pagure.io

+

Pagure.io is a Open Source software hosting site.

+
+{% endif %} {%- endmacro %} + diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html index 84589ec..ffef53b 100644 --- a/pagure/templates/_formhelper.html +++ b/pagure/templates/_formhelper.html @@ -142,7 +142,7 @@ {% if id != 0 and g.fas_user %} - + {% endif %} {% if id != 0 and g.fas_user and (g.repo_committer or ( @@ -151,7 +151,7 @@ - + {% endif %} {% if id != 0 and g.fas_user and (g.repo_committer or ( @@ -161,7 +161,7 @@ name="drop_comment" value="{{ comment.id }}" onclick="return confirm('Do you really want to remove this comment?');" title="Remove comment"> - + {% endif %} @@ -184,7 +184,7 @@ {% if g.fas_user %} - + {% endif %} {% if g.repo_committer or ( @@ -196,12 +196,12 @@ namespace=repo.namespace, issueid=issueid) }}" title="Edit this issue"> - + {% endif %} {% if g.repo_committer %} {% endif %} diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html index 7dc1f34..4adfd93 100644 --- a/pagure/templates/_render_repo.html +++ b/pagure/templates/_render_repo.html @@ -1,14 +1,36 @@ +{% macro searchbox(select) %} +
+ + + {% if select == 'projects' %} + + {% endif %} + + + +
+{% endmacro%} + {% macro render_row(items) -%} {% for repo in items %} {% set url = url_for('ui_ns.view_repo', username=repo.user.username if repo.is_fork else None, repo=repo.name, namespace=repo.namespace) %}
-
+
{% if repo.avatar_email %} - + {% else %} -
+
{% endif %}
@@ -29,7 +51,7 @@
- + {{repo.forks|count}}
@@ -50,15 +72,15 @@
+
+ {{searchbox(select)}} + +
+ + {% if not sorting or sorting == 'name'%} + + {%endif%} + Name + + + {% if sorting == 'latest'%} + + {%endif%} + Recent First + + + {% if sorting == 'oldest'%} + + {%endif%} + Oldest First +
- {% if total and total > 1 %} - {{ pagination_link(pagetitle, page, total, sorting=sorting) }} - {% endif %} - +
+
+
+ {{ render_row(list) }} +
+ {% if total and total > 1 %} + {{ pagination_link(pagetitle, page, total, sorting=sorting) }} + {% endif %} {% endmacro %} {% macro render_user_repos( @@ -214,43 +230,45 @@ {% if total_page and total_page > 1 %} {{ pagination_link(pagetitle, page, total_page) }} {% endif %} -
+
{{name}} {{total}}
{% if list %}
{% for repo in list %} + {% set url = url_for('ui_ns.view_repo', + repo=repo.name, + username=repo.user.username if repo.is_fork else None, + namespace=repo.namespace) %}
- {% set url = url_for('ui_ns.view_repo', - repo=repo.name, - username=repo.user.username if repo.is_fork else None, - namespace=repo.namespace) %} - - {% if repo.avatar_email %} - - {% else %} -
- +
+ {% if repo.avatar_email %} + + {% elif repo.is_fork %} +
+
- {% endif %} - - -
- - {{ repo.fullname }} - + {% else %} +
+
- - -
- {% if - repo.description %}{{ repo.description }}{% - else %}no description{% - endif %} + {% endif %} +
+ {{ repo.fullname }} + +
+ + {% if repo.description %} + {{ repo.description }} + {% else %} + no description + {% endif %} + +
+
{% endfor %} @@ -291,7 +309,7 @@ @@ -309,7 +327,7 @@ var cal = new CalHeatMap(); var tz = jstz.determine().name(); cal.init({ - cellSize: 9, + cellSize: 8, domain: "month", subDomain: "day", domainLabelFormat: "%b", @@ -356,3 +374,4 @@
{% endmacro%} + diff --git a/pagure/templates/add_group.html b/pagure/templates/add_group.html index d40f291..e6376f6 100644 --- a/pagure/templates/add_group.html +++ b/pagure/templates/add_group.html @@ -9,12 +9,12 @@
-
-
+
+
Create new group
-
+
{{ render_bootstrap_field(form.group_name, field_description="the name of your group") }} {{ render_bootstrap_field(form.display_name, field_description="display name of your group") }} diff --git a/pagure/templates/add_token.html b/pagure/templates/add_token.html index bd65a7b..acf71fe 100644 --- a/pagure/templates/add_token.html +++ b/pagure/templates/add_token.html @@ -11,12 +11,12 @@ {% macro render_page() %}
-
+
Create a new token
-
+

From the list below, select one or more actions you want to authorize this token for. @@ -53,7 +53,7 @@ }}">Cancel {% else %} Cancel + }}#nav-api-tab">Cancel {% endif %} {{ form.csrf_token }} diff --git a/pagure/templates/api.html b/pagure/templates/api.html index d14e235..9c4db4c 100644 --- a/pagure/templates/api.html +++ b/pagure/templates/api.html @@ -9,7 +9,7 @@

- +   Pagure API Reference

@@ -29,7 +29,7 @@

Projects - +

@@ -42,7 +42,7 @@

Issues - +

@@ -55,7 +55,7 @@

Pull-requests - +

@@ -67,7 +67,7 @@

Users - +

@@ -79,7 +79,7 @@

Groups - +

@@ -92,7 +92,7 @@

Continous Integration Services - +

@@ -105,7 +105,7 @@

Extras - +

diff --git a/pagure/templates/blame.html b/pagure/templates/blame.html index 4eba4ea..d1f913e 100644 --- a/pagure/templates/blame.html +++ b/pagure/templates/blame.html @@ -17,10 +17,10 @@
{% if repo.is_fork %} - + {{ repo.user.user }}/{{ repo.name }} {% else %} - {{ repo.name }} + {{ repo.name }} {% endif %}
@@ -28,7 +28,7 @@
{% for branch in g.branches %} @@ -70,7 +70,7 @@ namespace=repo.namespace, identifier=branchname) }}"> - +   {{ branchname }} @@ -88,11 +88,11 @@ namespace=repo.namespace, identifier=branchname, filename=path | unicode)}}"> -   {{ file }} +   {{ file }} {% elif file %}
  • - +   {{ file }}
    • {% endif %} diff --git a/pagure/templates/comment_update.html b/pagure/templates/comment_update.html index 3ded1ac..3380d56 100644 --- a/pagure/templates/comment_update.html +++ b/pagure/templates/comment_update.html @@ -53,7 +53,7 @@ type: 'POST', data: { content: _text, - csrf_token: "{{ form.csrf_token.current_token }}", + csrf_token: "{{ confirmationform.csrf_token.current_token }}", }, dataType: 'html', success: function(res) { diff --git a/pagure/templates/commit.html b/pagure/templates/commit.html index f9459c1..ec07604 100644 --- a/pagure/templates/commit.html +++ b/pagure/templates/commit.html @@ -7,176 +7,182 @@ {% block repo %} {% set splitted_message = commit.message.split('\n') %} -
    -

    - Commit {{ commitid|short }} - {{ splitted_message[0] }} -
    - raw - patch - tree - {% if commit.parents|length == 1 %} - parent - {% elif commit.parents|length > 1 %} -
    - -
    - {% for parent in commit.parents %} - {{parent.oid.hex}} - {% endfor %} +
    +
    + {% block overviewtabs %}{{ super() }}{% endblock %} +
    +
    +
    +

    + Commit {{ commitid|short }} + {{ splitted_message[0] }} +
    + raw + patch + tree + {% if commit.parents|length == 1 %} + parent + {% elif commit.parents|length > 1 %} +
    + +
    + {% for parent in commit.parents %} + {{parent.oid.hex}} + {% endfor %} +
    +
    + {% endif%}
    -

    - {% endif%} +

    +
    + {% if commit.author| author2user == commit.committer| author2user %} + {{ diff|count}} file{{'s' if diff|count > 1 }} + {% if commit.parents | length == 1 %} + Authored and Committed by {{ commit.author | author2user |safe }} + {% else %} + Merged and Committed by {{ commit.author | author2user |safe }} + {% endif %} + + {{ commit.commit_time | humanize }} + + {% else %} + {{ diff|count}} file{{'s' if diff|count > 1 }} + {% if commit.parents | length == 1 %} + Authored by {{ commit.author | author2user |safe }} + {% else %} + Merged by {{ commit.author | author2user |safe }} + {% endif %} + + {{ commit.commit_time | humanize }} + , + Committed by {{ commit.committer | author2user |safe }} + + {{ commit.commit_time | humanize }} + , + {% endif%} +
    - -
    - {% if commit.author| author2user == commit.committer| author2user %} - {{ diff|count}} file{{'s' if diff|count > 1 }} - {% if commit.parents | length == 1 %} - Authored and Committed by {{ commit.author | author2user |safe }} - {% else %} - Merged and Committed by {{ commit.author | author2user |safe }} - {% endif %} - - {{ commit.commit_time | humanize }} - - {% else %} - {{ diff|count}} file{{'s' if diff|count > 1 }} - {% if commit.parents | length == 1 %} - Authored by {{ commit.author | author2user |safe }} - {% else %} - Merged by {{ commit.author | author2user |safe }} - {% endif %} - - {{ commit.commit_time | humanize }} - , - Committed by {{ commit.committer | author2user |safe }} - - {{ commit.commit_time | humanize }} - , - {% endif%} -
    -
    - -
    - {% if splitted_message|length > 1 %} - 
    -        {% for message in splitted_message %}
-{{ message }}
-        {% endfor %}
-
    - {% endif %} -
    +
    +
    +
      + {% for flag in flags %} +
    • +
      + + {{ flag.username }} + +
      + + {{- flag.status -}} + {%- if flag.percent %} ({{ flag.percent }}%) {%- endif -%} + +
      +
      +
      + {{ flag.comment }} +
      + {{ flag.date_created | humanize }}
      +
      +       +
      • + {% endfor %} +
    +
    +
    -
    -
    -
      - {% for flag in flags %} -
    • -
      - - {{ flag.username }} - -
      - - {{- flag.status -}} - {%- if flag.percent %} ({{ flag.percent }}%) {%- endif -%} + {% set filecount = 0 %} + {% for patch in diff %} + {% set filecount = filecount + 1 %} +
      +
      + + {{ patch.delta.new_file.path | unicode }} + + {% if not patch.is_binary %} + {% if (patch.line_stats[1] + patch.line_stats[2]) %} + + {% if patch.line_stats[1] > 0 %}+{{ patch.line_stats[1] }} {% endif %} + {% if patch.line_stats[2] > 0 %}-{{ patch.line_stats[2] }}{% endif %} -
      -
      -
      - {{ flag.comment }} -
      - {{ flag.date_created | humanize }}
      -
      -       -
      • - {% endfor %} -
    -
    -
    + {% endif %} + {% endif %} +
    -{% set filecount = 0 %} -{% for patch in diff %} - {% set filecount = filecount + 1 %} -
    -
    - - {{ patch.delta.new_file.path | unicode }} - - {% if not patch.is_binary %} - {% if (patch.line_stats[1] + patch.line_stats[2]) %} - - {% if patch.line_stats[1] > 0 %}+{{ patch.line_stats[1] }} {% endif %} - {% if patch.line_stats[2] > 0 %}-{{ patch.line_stats[2] }}{% endif %} - - {% endif %} - {% endif %} + {% if patch.is_binary %} +

    Binary diffs cannot be rendered.

    + {% else %} + {% autoescape false %} + {{ patch|patch_to_diff|html_diff}} + {% endautoescape %} + {% endif %} +
    - - {% if patch.is_binary %} -

    Binary diffs cannot be rendered.

    - {% else %} - {% autoescape false %} - {{ patch|patch_to_diff|html_diff}} - {% endautoescape %} - {% endif %}
    - {% endfor %} {% endblock %} @@ -199,7 +205,7 @@ repouser: "{{ repo.user.user if repo.is_fork else '' }}", namespace: "{{ repo.namespace if repo.namespace else '' }}", commit_id: "{{ commitid }}", - csrf_token: "{{ form.csrf_token.current_token }}", + csrf_token: "{{ confirmationform.csrf_token.current_token }}", }, dataType: 'json', success: function(res) { @@ -218,7 +224,7 @@ return; } el.before( - '
    ' + '
    ' + _br + '
    '); } }); diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html index 5443639..17bc120 100644 --- a/pagure/templates/commits.html +++ b/pagure/templates/commits.html @@ -7,167 +7,202 @@ {% set tag = "home" %} {% block repo %} -
    - {% if g.repo_obj and g.repo_obj.is_empty %} -
    -
    {% endblock %} @@ -175,8 +210,9 @@ {{ super() }} +{% endblock %} diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 755d6c6..0754d1c 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -4,14 +4,256 @@ repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} {% set tag = "home" %} +{% if g.repo_watch_levels == ['issues', 'commits'] %} + {% set watch_button_title = 'You are watching issues, PRs, and commits on this project' %} + {% set watch_button_text = 'Unwatch' %} +{% elif g.repo_watch_levels == ['issues'] %} + {% set watch_button_title = 'You are watching issues on this project' %} + {% set watch_button_text = 'Unwatch' %} +{% elif g.repo_watch_levels == ['commits'] %} + {% set watch_button_title = 'You are watching commits on this project' %} + {% set watch_button_text = 'Unwatch' %} +{% else %} + {% set watch_button_title = 'You are not watching this project' %} + {% set watch_button_text = 'Watch' %} +{% endif %} + {% block header %} {% endblock %} {% block repo %}
    +
    + {% block overviewtabs %}{{ super() }}{% endblock %} +
    +
    +
    +
    + {% if repo.is_fork -%} + + {% elif repo.avatar_email %} + + {% endif %} +

    + {% if repo.is_fork -%} + {{ repo.user.user }} /  + {%- endif -%} + {%- if repo.namespace -%} + {{ repo.namespace }} /  + {%- endif -%}{{ repo.name }} + {% if repo.private %} + + {% endif %} +

    + {% if repo.is_fork and repo.parent %} + + Forked from + + {{ repo.parent.fullname }} + + {{repo.date_created|humanize}} + + {% elif repo.is_fork and not repo.parent %} + + Forked from a deleted repository {{repo.date_created|humanize}} + + {% endif %} + {% if not repo.is_fork %} + + Created by + + {{ repo.user.user }} + + {{repo.date_created|humanize}} + + {% endif %} +
    + {% if repo.description %}{{ repo.description | safe }}{% else %}-{% endif -%} + {%- if repo.url %}  |  {{ repo.url }}{% endif %} +
    +
    + {% if not g.repo_starred %} + + Star + + {{ g.forkbuttonform.csrf_token }} + + + {{ repo.stargazers|length }} + {% else %} + +
    + {{ g.forkbuttonform.csrf_token }} +
    + Unstar     + {{repo.stargazers|length}} + {% endif %} +
    + +
    + + + {{watch_button_text}} + + {{repo.watchers|length}} +
    +
    + +
    +
    + +
    +
    + Watch Issues and PRs +
    +
    +     + +
    +
    + +
    +
    + Watch Commits +
    +
    +     + +
    +
    + +
    +
    + Watch Issues, PRs, and Commits +
    +
    +     + +
    +
    + +
    +
    + Unwatch +
    +
    +     + +
    +
    + +
    +
    + Reset watch status +
    +
    +     + {{ g.forkbuttonform.csrf_token }} +
    +
    +
    +
    + + + Members + + {{repo.contributors|length+1}} +
    +
    +
    + +
    +

    + {{ repo.user.user }} +

    + {{ repo.user.fullname }} +
    +
    main admin
    +
    + {% for access in repo.contributors %} + {% for user in repo.contributors[access] %} +
    + +
    +

    + {{ user.user }} +

    + {{ user.fullname }} +
    +
    {{ access }}
    +
    + {% endfor %} + {% endfor %} + {% for access in repo.contributor_groups %} + {% for group in repo.contributor_groups[access] %} +
    + + @{{ group.group_name }} + + - {{ access }} +
    +
    +
    +

    + @{{ group.group_name }} +

    +
    +
    {{ access }}
    +
    + {% endfor %} + {% endfor %} +
    +
    +
    +
    +
    {% if g.repo_obj and g.repo_obj.is_empty %} -
    -
    {% else %} -
    {% if readme %}
    {{ readme | noJS | safe }} @@ -46,213 +286,15 @@ git push -u origin master
    {% endif %} -
    {% endif %} -
    -
    -
    -
    Source GIT URLs{% if - (g.authenticated and g.repo_committer) or - (config['DOC_APP_URL'] and repo and - repo.settings.get('project_documentation', True)) - %} - {%endif%}
    -
    - {% if g.authenticated and g.repo_committer %} -
    -
    -
    SSH
    - -
    -
    - {% endif %} -
    -
    -
    GIT
    - -
    -
    -
    - {% if config['DOC_APP_URL'] - and repo - and repo.settings.get('project_documentation', True) %} -
    Docs GIT URLs
    - {% if g.authenticated and g.repo_committer %} -
    -
    -
    SSH
    - -
    -
    - {% endif %} -
    -
    -
    GIT
    - -
    -
    - {% endif %} - {% if g.authenticated and g.repo_committer %} - {% if config.get('ENABLE_TICKETS', True) - and repo.settings.get('issue_tracker', True) %} -
    Issues GIT URLs
    -
    -
    -
    SSH
    - -
    -
    - {% endif %} -
    Pull Requests GIT URLs
    -
    -
    -
    SSH
    - -
    -
    - {% endif %} -
    -
    -
    -
    -
    -
    -
    Contributors
    -
    - - {% for access in repo.contributors %} - {% for user in repo.contributors[access] %} - - {% endfor %} - {% endfor %} - {% for access in repo.contributor_groups %} - {% for group in repo.contributor_groups[access] %} -
    - - @{{ group.group_name }} - - - {{ access }} -
    - {% endfor %} - {% endfor %} -
    -
    Branches
    -
    - {% if head %} -
    -
    - {% if branchname == head %} - - {{ head }} - {% else %} - - - {{ head }} - - {% endif %} -
    -
    - -
    -
    - {% endif %} - - {% for branch in g.branches if branch != head %} -
    -
    - - {% if branchname != branch %} - {{ branch }} - - {% else %} - {{ branch }} - {% endif %} - -
    -
    - {% if g.repo_committer and branch != head and config.get('ALLOW_DELETE_BRANCH', True) %} -
    - {{ form.csrf_token }} - - - -
    - {% endif %} -
    -
    - {% endfor %} -
    - {% if head %} -
    - Open Pull-Request - -
    - {% endif %} -
    -
    - created {{repo.date_created|humanize}} -
    -
    - +
    + {#
    {% if last_commits %}
    Recent Commits in - + {{branchname}} @@ -284,7 +326,7 @@ git push -u origin master
    {% endif %} -
    +
    #}
    {% endblock %} @@ -293,7 +335,32 @@ git push -u origin master {{ super() }} + {% endblock %} + +{% block overviewtabs %} + +{% endblock %} diff --git a/pagure/templates/repo_stats.html b/pagure/templates/repo_stats.html index 3971b8e..4f677de 100644 --- a/pagure/templates/repo_stats.html +++ b/pagure/templates/repo_stats.html @@ -8,38 +8,32 @@ {% block repo %}
    -
    -
    - +
    -
    - Commits -
    -
    - Forks - + {{ repo.forks |length }} -
    {% if config.get('ENABLE_TICKETS', True) %} -
    - Issues -
    {% endif %} +
    -
    +
    @@ -55,7 +49,7 @@ repo=fork.name, username=fork.user.user, namespace=repo.namespace) }}"> - + {{ fork.user.user }}/{{ fork.name }}
    @@ -129,7 +123,7 @@ commits_authors_call = function() { ) _s.show(); var data = { - csrf_token: "{{ form.csrf_token.current_token }}", + csrf_token: "{{ confirmationform.csrf_token.current_token }}", repo: "{{ g.repo.name }}", username: "{{ username or '' }}", namespace: "{{ g.repo.namespace or '' }}", @@ -150,7 +144,7 @@ commits_history_call = function() { + "" ); var data = { - csrf_token: "{{ form.csrf_token.current_token }}", + csrf_token: "{{ confirmationform.csrf_token.current_token }}", repo: "{{ g.repo.name }}", username: "{{ username or '' }}", namespace: "{{ g.repo.namespace or '' }}", @@ -167,17 +161,22 @@ $(document).ready(function() { $('.stats_btn').click(function(ev){ var _b = $("#data_stats"); _b.hide(); + $('.stats_btn').removeClass('active') $("#forks_list").hide(); if ($(this).attr('name') == 'issues') { {% if config.get('ENABLE_TICKETS', True) %} issues_history_stats_plot_call(); + $(this).addClass('active'); {% endif %} } else if ($(this).attr('name') == 'authors') { commits_authors_call(); + $(this).addClass('active'); } else if ($(this).attr('name') == 'commits') { commits_history_call(); + $(this).addClass('active'); } else if ($(this).attr('name') == 'forks') { toggle_forks(); + $(this).addClass('active'); } }); diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html index a49e971..52fcca7 100644 --- a/pagure/templates/requests.html +++ b/pagure/templates/requests.html @@ -17,33 +17,6 @@ elif status|lower in ['closed', 'false'] %} Closed/Merged {%- endif %} Pull Requests (of {{ requests_cnt }}) - {% if g.authenticated and repo.settings.get('pull_requests', True) %} - - - - - - {%endif%}
    @@ -150,7 +123,7 @@ {% if request.user_comments|count > 0 %}    - {{ request.user_comments|count }} @@ -227,96 +200,3 @@ {{ pagination_link('page', g.page, total_page) }} {% endblock %} - - -{% block jscripts %} -{{ super() }} -{% if g.authenticated %} - -{% endif %} -{% endblock %} diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html index e4909ce..1ceefff 100644 --- a/pagure/templates/roadmap.html +++ b/pagure/templates/roadmap.html @@ -7,32 +7,42 @@ {% block repo %} {% macro render_issue_list(issues, title, id, milestone, total) %} -
    -
    - +
    +
    + +
    +
    +

    +
    +
    + {{ title }} + {{ issues | length }} issues +
    + {% if milestone and milestone in repo.milestones and repo.milestones[milestone]['date'] %} +
    + Due: {{repo.milestones[milestone]['date'] }} +
    + {% endif %} +
    +

    +
    - - + {% if status and status|lower == 'closed' %} {% else %} - + {% endif %} - - - + @@ -40,10 +50,10 @@ {% for issue in issues |sort(attribute='sortable_priority') %} {% if status is none or status|lower == 'all' or issue.status == status %} -
    {{ title }} - - {% if milestone and milestone in repo.milestones and repo.milestones[milestone]['date'] %} - (Due: {{ - repo.milestones[milestone]['date'] }}) - {% endif %} ({{ issues | length }} {% - if total %}of {{ total }}{% endif %}) + OpenedOpenedClosedModifiedModified + Priority + Assignee StatusStatus
    - #{{ issue.id }} + + #{{ issue.id }} {% if issue.private %} - + {% endif %} - {{ issue.comments | count }} @@ -121,42 +131,32 @@ {% endmacro %} -

    +

    Milestone Roadmap -
    - List - - {% if g.repo.reports %} -
    + + Configure Milestones -
    - {% for report in repo.reports %} - - Report: {{ report }} - - {% endfor %} -
    + {% endif %} {% endif %}
    -

    -
    + -
    - +
    +
    + Open Closed All - + Active Milestones All Milestones No Milestone - + {% if milestones %} {% for stone in milestones %} - + {% for tag in tag_list %} - - {{ tag }} + {{ tag }} {% endfor %} -
    + + {% if not issues %}
    diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html index 21801ee..e382080 100644 --- a/pagure/templates/settings.html +++ b/pagure/templates/settings.html @@ -11,1097 +11,1199 @@ {% block repo %} - -
    -

    Settings for {{ repo.fullname }}

    +
    -
    -
    -
    - Project Details -
    -
    -
    -
    - - - Short description of the project -
    -
    - - - Website URL of the project -
    -
    - - - Email address linked to avatar to display for the project -
    -
    - - - - Tags for project itself, as a comma-separated list. Tags - for issues are managed further down on this page. - -
    - {% if config.get('PRIVATE_PROJECTS', False) and repo.private %} -
    -
    - {% endif %} - - {{ form.csrf_token }} -
    +
    +
    +
    -
    -
    -
    - Default Branch -
    -
    -
    +
    +
    +

    + Project Details +

    +
    +
    + - {{ branches_form.csrf_token }} - {{ branches_form.branches(class_="c-select") }} - - -
    -
    -
    - {% if config.get('WEBHOOK', False) %} -
    -
    -
    - Private web-hook key -
    -
    -

    - Each message sent to the web-hook are signed via hmac and SHA1 using - this private key. -

    -

    - This key is private to your project, make sure to store in a safe place - and do not share it. -

    -
    -
    -
    - -
    -
    - -
    - - {{ form.csrf_token }} -
    -
    -
    -
    - {% endif %} - -
    -
    -
    - API Keys -
    -
    -

    - API keys are tokens used to authenticate you on pagure. They can also - be used to grant access to 3rd party application to behave on this - project on your name. -

    -

    - These are your personal tokens; they are not visible to the other - admins of this repository. -

    -

    - These keys are valid for 60 days. -

    -

    - These keys are private to your project, make sure to store in a safe - place and do not share it. -

    -
    - {% if repo.tokens %} -
      - {% for token in repo.tokens %} - {% if token.user.username == g.fas_user.username %} -
    • -
      -
      - {{ token.description or '' }} -
      -
      -
      - -
      - -
      -
      - {% if token.expired %} - Expired since {{ token.expiration.date() }} - {% else %} - Valid until: {{ token.expiration.date() }} -
      - {{ form.csrf_token }}
      - {% endif %} - - -
      • +
    {% endif %} - {% endfor %} - - {% endif %} -
    - - - -
    -
    -
    - -
    -
    -
    - Project options -
    -
    -
    - {% for key in repo.settings | sort %} - {% if not config.get('ENABLE_TICKETS', True) and key in ['issue_tracker', 'issues_default_to_private'] %} - {% elif not config.get('DOC_APP_URL') and key in ['project_documentation'] %} - {% elif not config.get('WEBHOOK') and key in ['Web-hooks'] %} - {% else %} - {% if repo.settings[key] in [True, False, 'y'] %} -
    - -
    - {% elif key in ['Web-hooks'] %} -
    - - -
    - {% else %} -
    - - -
    - {% endif %} - {% endif %} - {% endfor %} -
    -

    - - {{ form.csrf_token }} -

    - - {% if config.get('WEBHOOK') and repo.settings['Web-hooks'] %} -
    +

    + API Keys + - {{ form.csrf_token }} - - - {% endif %} -

    -
    -
    - -
    -
    -
    - Public notifications -
    -
    -

    - The email addresses entered below will receive all the notifications - related to {% if config.get('ENABLE_TICKETS', True) %} - (public) issues and {% endif %}pull-requests, this includes - notifications about {% if config.get('ENABLE_TICKETS', True) %} - new issue or {% endif %} new pull-request, new comment - and status change. -

    -

    - To enter multiple addresses, separate them with a comma. -

    -
    -
    - {{ tag_form.csrf_token }} -
    - - {% if config.get('ENABLE_TICKETS', True) %} + namespace=repo.namespace) }}" method="post" class="icon float-right"> + + +
    -
    - Issues notifications +
    +

    + API keys are tokens used to authenticate you on pagure. They can also + be used to grant access to 3rd party application to behave on this + project on your name. +

    +

    + These are your personal tokens; they are not visible to the other + admins of this repository. +

    +

    + These keys are valid for 60 days. +

    +

    + These keys are private to your project, make sure to store in a safe + place and do not share it. +

    + {% if repo.tokens %} + {% for token in repo.tokens %} + {% if token.user.username == g.fas_user.username %} +
    +
    +
    + + {{ token.description or '' }} +
    +
    + + {{token.acls_list_pretty|length}} ACLs + + +
    + + + + {% if token.expired %} + + Expired on {{ token.expiration.date() }} + + {% else %} + + Active until {{ token.expiration.date() }} + + {% endif %} + {% if not token.expired %} + + + {{ form.csrf_token }} + + {% endif %} +
    +
    + {% endif %} + {% endfor %} + {% endif %}
    +
    -
    -
    -
    - +
    +

    + Project Options +

    +
    +
    +
    + {% for key in repo.settings | sort %} + {% if not config.get('ENABLE_TICKETS', True) and key in ['issue_tracker', 'issues_default_to_private'] %} + {% elif not config.get('DOC_APP_URL') and key in ['project_documentation'] %} + {% elif not config.get('WEBHOOK') and key in ['Web-hooks'] %} + {% else %} + {% if repo.settings[key] in [True, False, 'y'] %} +
    + +
    + {% elif key in ['Web-hooks'] %} +
    + + +
    + {% else %} +
    + + +
    + {% endif %} + {% endif %} + {% endfor %} +

    + + {{ form.csrf_token }} +

    +
    + {% if config.get('WEBHOOK') and repo.settings['Web-hooks'] %} +
    + {{ form.csrf_token }} + +
    + {% endif %}
    -
    - - {% endif %} -
    -
    - Pull-requests notifications -
    -
    +
    -
    -
    -
    - +
    +

    + Public Notifications +

    +
    +
    +

    + The email addresses entered below will receive all the notifications + related to {% if config.get('ENABLE_TICKETS', True) %} + (public) issues and {% endif %}pull-requests, this includes + notifications about {% if config.get('ENABLE_TICKETS', True) %} + new issue or {% endif %} new pull-request, new comment + and status change. +

    +

    + To enter multiple addresses, separate them with a comma. +

    +
    + {{ tag_form.csrf_token }} +
    + + {% if config.get('ENABLE_TICKETS', True) %} +
    +
    + Issues notifications +
    +
    + +
    +
    +
    + +
    +
    +
    + + {% endif %} +
    +
    + Pull-requests notifications +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    -
    +
    -
    -
    - + {% if config.get('ENABLE_USER_MNGT', True) %} +
    +

    + Users & Groups +

    +
    +
    +

    Below is the list of user having commit rights to this repo.

    + +

    + + add user + + + + add group + +

    + +
    - -
    - -
    -
    - -
    -
    -
    - Re-generate git repos -
    -
    - {% if config.get('ENABLE_TICKETS', True) %} -
    - - - {{ form.csrf_token }} -
    {% endif %} -
    - - - {{ form.csrf_token }} -
    -
    -
    -
    - {% if config.get('ENABLE_USER_MNGT', True) %} -
    -
    -
    - Users and Groups -
    -
    - -

    Below is the list of user having commit rights to this repo.

    - -

    - - add user - - - - add group - -

    -
    - -
    -
    - {% endif %} - - {% if config.get('DEPLOY_KEY', True) %} -
    -
    -
    - Deploy Keys -
    -
    - -

    Below are this projects' deploy keys.

    - -

    - +

    + Deploy Keys + + class="btn btn-outline-primary btn-sm float-right"> add deploy key - -

    -

    -
      - {% for deploykey in repo.deploykeys %} -
    • - {{ deploykey.ssh_short_key }} - {% if deploykey.pushaccess %} - (PUSH ACCESS) - {% endif %} -
      - - {{ form.csrf_token }} -
      -
      • - {% endfor %} -
    -
    -
    - {% endif %} - - - {% if plugins %} -
    -
    -
    - Hooks -
    -
    -
    - - {% for plugin in plugins %} - {% if not config.get('ENABLE_TICKETS', True) and plugin in ['Pagure tickets'] %} - {% else %} -
    - -
    - - + + +
    +
    +

    Below are this projects' deploy keys.

    + {% for deploykey in repo.deploykeys %} +
    +
    +
    + +
    + {% if deploykey.pushaccess %} +
    + Push Access +
    + {% endif %} + +
    + + {{ form.csrf_token }} +
    +
    +
    + {% endfor %} +
    - {% endif %} - {% endfor %} -
    -
    -
    -
    - {% endif %} - - {% if config.get('ENABLE_TICKETS', True) - and repo.settings.get('issue_tracker', True) %} -
    -
    + {% endif %} -
    - Priorities -
    -
    -

    - Below are the priorities you may assign to a ticket, allowing you - to sort them with it. The Weight determines the ordering. Higher - priority should correspond to lower weight. - - To remove an entry, simply clean the Weight and Title - -

    -
    -
    - {{ tag_form.csrf_token }} -
    -
    -
    - Weight -
    -
    - Title -
    -
    -
    - {% for priority in ((repo.priorities or [""]) | sort) %} -
    -
    - -
    -
    - + {% if plugins %} +
    +

    + Hooks +

    +
    +
    +
    + {% for plugin in plugins %} + {% if not config.get('ENABLE_TICKETS', True) and plugin in ['Pagure tickets'] %} + {% else %} +
    + +
    + + +
    +
    + {% endif %} + {% endfor %} +
    - {% endfor %} -
    -
    -
    - - Add new priority - -
    - {% if not repo.priorities %} -
    - - Default priority set - -
    - {% endif %} -
    -
    -
    - -
    -
    - - - {% if repo.priorities %} -
    - Default Priority -
    -
    -

    - The default priority will be set to all issues created after - it has been set. -

    -
    - -
    - {{ tag_form.csrf_token }} -
    -
    -
    - Default priority -
    -
    -
    - {{ priority_form.priority(class_="c-select") }} -
    + {% endif %} -
    -
    - + {% if config.get('ENABLE_TICKETS', True) + and repo.settings.get('issue_tracker', True) %} +
    +

    + Priorities +

    +
    +
    +

    + Below are the priorities you may assign to a ticket, allowing you + to sort them with it. The Weight determines the ordering. Higher + priority should correspond to lower weight. + + To remove an entry, simply clean the Weight and Title + +

    + + {{ tag_form.csrf_token }} +
    +
    + Weight +
    +
    + Title +
    +
    +
    + {% for priority in ((repo.priorities or [""]) | sort) %} +
    +
    + +
    +
    + +
    +
    + +
    +
    + {% endfor %} +
    + + Add new priority + + {% if not repo.priorities %} + + Populate with defaults + + {% endif %} +
    +
    +
    +
    + +
    +
    + +
    + {% if repo.priorities %} +

    + Default Priority +

    +
    +
    +

    + The default priority will be set to all issues created after + it has been set. +

    +
    + {{ tag_form.csrf_token }} +
    +
    +
    + Default priority +
    +
    +
    + {{ priority_form.priority(class_="c-select") }} +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + {% endif %}
    -
    - - {% endif %} -
    -
    -
    - {% include 'settings_milestones.html' %} -
    - -
    -
    -
    - Close status -
    -
    -

    - Here is the list of all the status that can be used when closing - an issue. -

    -
    -
    - {{ tag_form.csrf_token }} -
    -
    -
    - Status -
    +
    + {% include 'settings_milestones.html' %}
    -
    - {% for status in repo.close_status or [""] | sort %} -
    -
    - + +
    +

    + Close Status +

    +
    +
    +

    + Here is the list of all the status that can be used when closing + an issue. +

    + + {{ tag_form.csrf_token }} +
    +
    + Status +
    +
    +
    + + {% for status in repo.close_status | sort %} +
    +
    + +
    + +
    + +
    +
    + {% endfor %} +
    + + Add new close status + + {% if not repo.close_status %} + + Populate with defaults + + {% endif %} +
    +
    +
    +
    + +
    +
    + +
    - {% endfor %} -
    -
    -
    - - Add new close status - -
    - {% if not repo.close_status %} -
    - - Default close status set - -
    - {% endif %} -
    -
    -
    - -
    -
    -
    - -
    -
    -
    -
    -
    - Custom issue fields -
    -
    -

    - Set some custom fields for your issues. Field Values are currently - only used for Lists, and it accepts a comma separated list of items - for the drop down list. -

    -
    -
    - {{ tag_form.csrf_token }} -
    -
    -
    - Fields -
    -
    - Field Type -
    -
    - Field Values (Lists only) -
    -
    - Notify -
    -
    -
    - {% for field in repo.issue_keys or [dict(key_type="", name="")] | sort %} -
    -
    - +
    +

    + Custom Issue Fields +

    +
    +
    +

    + Set some custom fields for your issues. Field Values are currently + only used for Lists, and it accepts a comma separated list of items + for the drop down list. +

    + + {{ tag_form.csrf_token }} +
    +
    + Fields +
    +
    + Field Type +
    +
    + Field Values (Lists only) +
    +
    + Notify +
    +
    +
    + + {% for field in repo.issue_keys | sort %} +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + {% endfor %} +
    + + Add new custom field + + + +
    +
    -
    - + +
    +

    + Tags +

    +
    +
    +

    + Here is the list of tags associated with this project (Issues and Pull Requests). +

    +
      + {% for tag in tags %} +
    • + +   {{ tag.tag }} + +  {{tag.tag}} +  {{ tag.tag_description or '' }} +
      +
      + + {{ tag_form.csrf_token }} + +
      + + + +
      +
      • + {% endfor %} +
    +
    + {{ tag_form.csrf_token }} +
    + +
    +
    +
    +
    + + Add New Tag + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    -
    - + + +
    +

    + Reports +

    +
    +
    +

    + Here is the list of reports saved for this project. +

    +
      + {% for report in repo.reports %} +
    • + + {{ report }} + +
      +
      + + {{ tag_form.csrf_token }} + +
      +
      +
      • + {% endfor %} +
    +
    +
    -
    - + + {% endif %} + + {% if (config.get('ENABLE_TICKETS', True) + and repo.settings.get('issue_tracker', True)) + or repo.settings.get('pull_requests', True) %} +
    +

    + Quick Replies +

    +
    +
    +

    Quick replies will be offered in a new comment form on Issue or + Pull Request page. This allows you to reply to common problems with a + click of a button.

    +

    The reply can use the same Markdown formatting as regular + comments. The list you will choose the reply from will only show the + first 50 characters. Please make sure the important message is at the + beginning.

    +

    The replies will be presented in the same order they are written + here.

    +
    + {{ tag_form.csrf_token }} +
    +
    + {% for quick_reply in repo.quick_replies or [""] %} +
    +
    + +
    +
    + {% endfor %} +
    +
    +
    + + Add new quick reply + +
    +
    +
    +
    + +
    +
    +
    +
    - {% endfor %} -
    -
    -
    - - Add new custom field - -
    -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    -
    - Project's Tags -
    -
    -

    - Here is the list of tags associated with this project (Issues and Pull Requests). -

    -
    -
      - {% for tag in tags %} -
    • - -   {{ tag.tag }} - -  {{tag.tag}} -  {{ tag.tag_description or '' }} -
      -
      - - {{ tag_form.csrf_token }} - -
      - - - -
      -
      • - {% endfor %} -
    -
    - {{ tag_form.csrf_token }} -
    - -
    -
    -
    -
    - - Add New Tag - -
    -
    -
    - -
    -
    -
    -
    -
    -
    + {% endif %} -
    -
    -
    - Reports -
    -
    -

    - Here is the list of reports saved for this project. -

    -
    -
      - {% for report in repo.reports %} -
    • - -   {{ report }} - -
      -
      - - {{ tag_form.csrf_token }} - -
      -
      -
      • - {% endfor %} -
    -
    -
    - {% endif %} - - {% if (config.get('ENABLE_TICKETS', True) - and repo.settings.get('issue_tracker', True)) - or repo.settings.get('pull_requests', True) %} -
    -
    -
    - Quick replies -
    -
    -

    Quick replies will be offered in a new comment form on Issue or - Pull Request page. This allows you to reply to common problems with a - click of a button.

    -

    The reply can use the same Markdown formatting as regular - comments. The list you will choose the reply from will only show the - first 50 characters. Please make sure the important message is at the - beginning.

    -

    The replies will be presented in the same order they are written - here.

    -
    -
    - {{ tag_form.csrf_token }} -
    -
    - {% for quick_reply in repo.quick_replies or [""] %} -
    -
    - +
    +

    + Regenerate Repos +

    +
    +
    + {% if config.get('ENABLE_TICKETS', True) %} + + + + {{ form.csrf_token }} + + {% endif %} +
    + + + {{ form.csrf_token }} +
    - {% endfor %} -
    -
    -
    - - Add new quick reply - -
    -
    -
    - -
    -
    -
    - -
    -
    - {% endif %} - {% if config.get('ENABLE_GIVE_PROJECTS', True) + {% if config.get('ENABLE_GIVE_PROJECTS', True) and (repo.user.user == g.fas_user.username or pagure_admin) and not repo.is_fork %} -
    -
    -
    - Give Project -
    -
    -
    - {{ tag_form.csrf_token }} - - -
    -
    -
    -
    - {% endif %} +
    +

    + Give Project +

    +
    +
    +
    + {{ tag_form.csrf_token }} + + +
    +
    +
    +
    + {% endif %} + {% if (not repo.is_fork and config.get('ENABLE_DEL_PROJECTS', True)) - or - (repo.is_fork and config.get('ENABLE_DEL_FORKS', - config.get('ENABLE_DEL_PROJECTS', True))) %} -
    -
    -
    - Delete Project -
    -
    - {% if repo.read_only %} + or + (repo.is_fork and config.get('ENABLE_DEL_FORKS', + config.get('ENABLE_DEL_PROJECTS', True))) %} +
    +

    + Delete Project +

    +
    +
    + {% if repo.read_only %} {% else %} @@ -1115,18 +1217,20 @@ {% endif %} +
    +
    +
    + {%endif %} +
    - {% endif %} -
    -
    {% endblock %} @@ -1184,23 +1288,59 @@ $('#accordions').on('hide.bs.collapse', function (e) { $(e.target).siblings().find("#dropdowncaret").attr('data-glyph', "caret-right"); }) +$('.add-settings-field-row').click(function(e) { + let target = $(this).attr("data-target"); + let row = $(target + ".settings-field-rows .blank-field").clone(); + row.removeClass("hidden"); + row.removeClass("blank-field"); + $('.remove-settings-field-row', row).click(function(e) { + $(this).parent().parent().remove(); + }); + $(target + ".settings-field-rows").append(row); + console.log(row); +}); + +$('.remove-settings-field-row').click(function(e) { + $(this).parent().parent().remove(); +}); + {% if not repo.priorities %} $('#default_priorities').click(function(e) { - let form = $('#priorities>div:last-child'); - form.find('input[type=text], textarea').val(''); - $('#priorities').html(''); - var def_priorities = ['', 'High', 'Normal', 'Low']; - for (var cnt = 1; cnt < def_priorities.length; cnt++) { - let f = form.clone(); - f.find("[name=priority_weigth]").val(cnt); + let row = $('#priorities-list .blank-field'); + var def_priorities = ['High', 'Normal', 'Low']; + for (var cnt = 0; cnt < def_priorities.length; cnt++) { + let f = row.clone(); + f.removeClass("hidden"); + f.removeClass("blank-field"); + f.find("[name=priority_weigth]").val(cnt+1); f.find("[name=priority_title]").val(def_priorities[cnt]); - $('#priorities').append(f); + $('.remove-settings-field-row', f).click(function(e) { + $(this).parent().parent().remove(); + }); + $('#priorities-list').append(f); } + $(e.target).hide(); console.log($('#priorities')); }); {% endif %} {% if not repo.close_status %} +$('#default_statuses').click(function(e) { + let row = $('#status-list .blank-field'); + var def_status = ['Fixed', 'Invalid', 'Duplicate', 'Insufficient Data']; + for (var cnt = 0; cnt < def_status.length; cnt++) { + let f = row.clone(); + f.removeClass("hidden"); + f.removeClass("blank-field"); + f.find("[name=close_status]").val(def_status[cnt]); + $('.remove-settings-field-row', f).click(function(e) { + $(this).parent().parent().remove(); + }); + $('#status-list').append(f); + } + $(e.target).hide(); +}); + $('#default_close_status').click(function(e) { let form = $('#close_sstatus>div:last-child'); form.find('input[type=text], textarea').val(''); @@ -1306,17 +1446,6 @@ $('.milestone_order_bottom').click(function(e) { } }); -$('#milestone_toggle').click(function(e) { - var _b = $('#milestone_toggle'); - if (_b.text().trim() == 'View all milestones'){ - $('.milestone_inactive').show(); - _b.text('Active milestones only'); - } else { - $('.milestone_inactive').hide(); - _b.text('View all milestones'); - } -}); - {% if config.get('ENABLE_GIVE_PROJECTS', True) and repo.user.user == g.fas_user.username and not repo.is_fork %} @@ -1339,6 +1468,27 @@ $('#user').selectize({ } }); {% endif %} + + + {% endblock %} diff --git a/pagure/templates/settings_milestones.html b/pagure/templates/settings_milestones.html index 5fc947a..cee8f12 100644 --- a/pagure/templates/settings_milestones.html +++ b/pagure/templates/settings_milestones.html @@ -1,15 +1,12 @@ -
    -
    - Roadmap -
    -
    -

    - Each issue can be assigned to a milestone. This way it is - possible to create a roadmap for your project. Below you can create - the milestones and optionally set dates for them. -

    -
    +

    + Roadmap +

    +

    + Each issue can be assigned to a milestone. This way it is + possible to create a roadmap for your project. Below you can create + the milestones and optionally set dates for them. +

    {{ tag_form.csrf_token }} -
    Milestone @@ -44,12 +40,10 @@ }}" class="form-control"/>
    - - + +
    -
    - + - Add new milestone - -
    -
    - - View all milestones + Add new milestone
    -
    -
    -
    diff --git a/pagure/templates/user_info.html b/pagure/templates/user_info.html index 01903d4..692d142 100644 --- a/pagure/templates/user_info.html +++ b/pagure/templates/user_info.html @@ -15,20 +15,23 @@ {% block content %} -
    +
    {{browse_header(select=tag)}}
    -

    - {{ user.default_email | avatar(36) | safe }} {{ username }} +
    + {{ user.default_email | avatar(64, css_class="align-self-center mr-3") | safe }} +
    +

    {{ username }}

    +
    + {{user.fullname}} • Joined {{ user.created | humanize }} +
    +
    +
    -

    -

    - Joined {{ user.created | humanize }} -

    {{ render_activity_graph(username) }} @@ -44,7 +47,7 @@
    -
    +
     {{ group }}
    @@ -109,7 +112,7 @@ $(document).ready(function() { render: { option: function(item, escape) { return '
    ' + - '
    '+ + '
    '+ '
    ' + '' + escape(item.user) + '' + '
    ' + diff --git a/pagure/templates/user_list.html b/pagure/templates/user_list.html index 4c07b1c..ea723bb 100644 --- a/pagure/templates/user_list.html +++ b/pagure/templates/user_list.html @@ -9,35 +9,16 @@ {% endblock %} {% block content %} -
    +
    {{browse_header(select=select)}}
    -
    - {% if total_page and total_page > 1 %} - - {% endif %} - -
    -

    +
    +
    +
    +

    Users {{ users_length }} {%- if g.authenticated and config.get('PAGURE_AUTH') == 'local' %} @@ -46,35 +27,37 @@ {% endif -%} -

    +

    {% for user in users %}
    -
    - - -
    {{ user.fullname or user.user }}
    -     -
    - {{ user.user }} joined {{ - user.created | humanize }} +
    +
    + +
    + +
    {{ user.user }}
    +     +
    {{ user.fullname }}
    +
    -
    -
    - - - {{- user.repos_length}}   + +
    + joined {{ + user.created | humanize }} +
    + + + {{- user.repos_length}}   - - - {{- user.forks_length}}   + + + {{- user.forks_length}}   - - - {{- user.groups|count}} + + + {{- user.groups|count}}
    @@ -82,7 +65,8 @@
    {% endfor %}
    -
    +
    +
    {% if total_page and total_page > 1 %}