kallithea Changeset - cf3cc1fa4222

Changeset - cf3cc1fa4222

Parent rev.

Child rev.

[Not reviewed]

default

0 10 0

Mads Kiilerich - 9 years ago 2016-12-04 22:53:36
mads@kiilerich.com

style: drop 'textarea' class inside 'form-group'

Temporarily, just apply styling to div inside form-group. Also, 'radios' is gone.

Based on work by Dominik Ruf.

10 files changed with 12 insertions and 59 deletions:

kallithea/public/css/style.css

kallithea/templates/admin/repo_groups/repo_group_add.html

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

kallithea/templates/admin/repos/repo_add_base.html

kallithea/templates/admin/repos/repo_edit_settings.html

kallithea/templates/admin/user_groups/user_group_add.html

kallithea/templates/admin/user_groups/user_group_edit_settings.html

kallithea/templates/forks/fork.html

kallithea/templates/pullrequests/pullrequest.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -671,497 +671,451 @@ div.header img { @@
     float: right;
     margin: 10px 0 10px 10px;
+}
 #content div.panel div.messages {
     clear: both;
     overflow: hidden;
     margin: 0 20px;
     padding: 0;
+}
 #content div.panel div.message {
     float: left;
     overflow: hidden;
     margin: 0;
     padding: 5px 0;
     white-space: pre-wrap;
+}
 #content div.panel #changeset_content div.message {
     padding: 15px 0;
+}
 #content div.panel div.expand {
     width: 110%;
     height: 14px;
     font-size: 10px;
     text-align: center;
     cursor: pointer;
     color: #666;
     background: linear-gradient(to bottom,rgba(255,255,255,0),rgba(64,96,128,0.1));
     display: none;
     overflow: hidden;
+}
 #content div.panel div.expand .expandtext {
     background-color: #ffffff;
     padding: 2px;
     border-radius: 2px;
+}
 #content div.panel div.message a {
     font-weight: 400 !important;
+}
 #content div.panel div.message div.image {
     float: left;
     margin: 9px 0 0 5px;
     padding: 6px;
+}
 #content div.panel div.message div.image img {
     vertical-align: middle;
     margin: 0;
+}
 #content div.panel div.message div.text {
     float: left;
     margin: 0;
     padding: 9px 6px;
+}
 #content div.panel div.message div.text h1,
 #content div.panel div.message div.text h2,
 #content div.panel div.message div.text h3,
 #content div.panel div.message div.text h4,
 #content div.panel div.message div.text h5,
 #content div.panel div.message div.text h6 {
     border: none;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.message div.text span {
     height: 1%;
     display: block;
     margin: 0;
     padding: 5px 0 0;
+}
 #content div.panel div.message-error {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #FBE3E4;
     border: 1px solid #FBC2C4;
     color: #860006;
+}
 #content div.panel div.message-error h6 {
     color: #860006;
+}
 #content div.panel div.message-warning {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #FFF6BF;
     border: 1px solid #FFD324;
     color: #5f5200;
+}
 #content div.panel div.message-warning h6 {
     color: #5f5200;
+}
 #content div.panel div.message-notice {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #8FBDE0;
     border: 1px solid #6BACDE;
     color: #003863;
+}
 #content div.panel div.message-notice h6 {
     color: #003863;
+}
 #content div.panel div.message-success {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #E6EFC2;
     border: 1px solid #C6D880;
     color: #4e6100;
+}
 #content div.panel div.message-success h6 {
     color: #4e6100;
+}
 #content div.panel div.form div.form-horizontal div.form-group {
     height: 1%;
     min-height: 12px;
     border-bottom: 1px solid #DDD;
     clear: both;
     padding: 0;
     margin: 10px 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group-first {
     padding: 0 0 10px;
+}
 #content div.panel div.form div.form-horizontal div.form-group-noborder {
     border-bottom: 0 !important;
+}
 #content div.panel div.form div.form-horizontal div.form-group span.error-message {
     height: 1%;
     display: inline-block;
     color: red;
     margin: 8px 0 0 4px;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group span.success {
     height: 1%;
     display: block;
     color: #316309;
     margin: 8px 0 0;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group > label {
     margin: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group > label {
     width: 155px;
     position: absolute;
     margin: 0;
     padding: 0px 0 0 0px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > label {
     color: #393939;
     font-weight: 700;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div {
     margin: 0 20px 0 200px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div.summary,
 #content div.panel div.form div.form-horizontal div.form-group > div.summary-short {
     margin: 10px 20px 10px 110px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div.summary-short input {
     margin: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div.file {
     margin: 0 20px 0 200px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div.editor {
     margin: 0 10px 0 200px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > label > input,
 #content div.panel div.form div.form-horizontal div.form-group > div input,
 #content div.panel div.form div.form-horizontal div.form-group > label > textarea,
 #content div.panel div.form div.form-horizontal div.form-group > div textarea,
 .reviewer_ac input {
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 12px;
     margin: 5px 0 10px;
     padding: 7px 7px 6px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div input#clone_url,
 #content div.panel div.form div.form-horizontal div.form-group > div input#clone_url_id
+{
     font-size: 14px;
     padding: 0 2px;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.file input {
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3;
     border-style: solid;
     border-width: 1px;
     color: #000000;
     font-size: 12px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 input[readonly],
 input.disabled {
     background-color: #F5F5F5 !important;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div select.form-control,
 #content div.panel div.form div.form-horizontal div.form-group > div div.form-control.select2-container,
 #content div.panel div.form div.form-horizontal div.form-group > div input.form-control {
     width: 100%;
     margin: 5px 0 10px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div input.date {
     width: 177px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div input.button {
     background: #D4D0C8;
     border-top: 1px solid #FFF;
     border-left: 1px solid #FFF;
     border-right: 1px solid #404040;
     border-bottom: 1px solid #404040;
     color: #000;
     margin: 0;
     padding: 4px 8px;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.textarea {
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     margin: 0 20px 0 200px;
     padding: 7px 7px 6px;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.textarea-editor {
     border: 1px solid #ddd;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.textarea textarea {
 #content div.panel div.form div.form-horizontal div.form-group > div textarea {
     width: 100%;
     height: 220px;
     overflow-y: auto;
     background: #FFF;
     color: #000;
     font-size: 12px;
     outline: none;
     border-width: 0;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.textarea table {
     width: 100%;
     border: none;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.textarea table td {
     background: #DDD;
     border: none;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.textarea table td table {
     width: auto;
     border: none;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.textarea table td table td {
     font-size: 11px;
     padding: 5px 5px 5px 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group input[type=text]:focus,
 #content div.panel div.form div.form-horizontal div.form-group input[type=password]:focus,
 #content div.panel div.form div.form-horizontal div.form-group input[type=file]:focus,
 #content div.panel div.form div.form-horizontal div.form-group textarea:focus,
 #content div.panel div.form div.form-horizontal div.form-group select:focus,
 .reviewer_ac input:focus {
     background: #f6f6f6;
     border-color: #666;
+}
 .reviewer_ac {
     padding: 10px
+}
 div.form div.form-horizontal div.form-group div.button {
     margin: 0;
     padding: 0 0 0 8px;
+}
 #content div.panel table.noborder {
     border: 1px solid transparent;
+}
 #content div.panel table {
     width: 100%;
     border-collapse: separate;
     margin: 0;
     padding: 0;
     border: 1px solid #eee;
     border-radius: 4px;
+}
 #content div.panel table th {
     background: #eee;
     border-bottom: 1px solid #ddd;
     padding: 5px 0px 5px 5px;
     text-align: left;
+}
 #content div.panel table th.left {
     text-align: left;
+}
 #content div.panel table th.right {
     text-align: right;
+}
 #content div.panel table th.center {
     text-align: center;
+}
 #content div.panel table th.selected {
     vertical-align: middle;
     padding: 0;
+}
 #content div.panel table td {
     background: #fff;
     border-bottom: 1px solid #cdcdcd;
     vertical-align: middle;
     padding: 5px;
+}
 #content div.panel table td.compact {
     padding: 0;
+}
 #content div.panel table tr.selected td {
     background: #FFC;
+}
 #content div.panel table td.selected {
     width: 3%;
     text-align: center;
     vertical-align: middle;
     padding: 0;
+}
 #content div.panel table td.action {
     width: 45%;
     text-align: left;
+}
 #content div.panel table td.date {
     width: 33%;
     text-align: center;
+}
 #content div.panel div.action {
     float: right;
     background: #FFF;
     text-align: right;
     margin: 10px 0 0;
     padding: 0;
+}
 #content div.panel div.action select {
     font-size: 11px;
     margin: 0;
+}
 #content div.panel div.action .ui-selectmenu {
     margin: 0;
     padding: 0;
+}
 #content div.panel ul.pagination {
     height: 1%;
     overflow: hidden;
     text-align: right;
     margin: 10px 0 0;
     padding: 0;
+}
 #content div.panel ul.pagination > li {
     display: inline;
+}
 #content div.panel ul.pagination > :first-child {
     border-radius: 4px 0px 0px 4px;
+}
 #content div.panel ul.pagination > :last-child {
     border-radius: 0px 4px 4px 0px;
     border-right: 1px solid #cfcfcf;
+}
 #content div.panel ul.pagination > li {
     height: 1%;
     float: left;
     background: #ebebeb url("../images/pager.png") repeat-x;
     border-top: 1px solid #dedede;
     border-left: 1px solid #cfcfcf;
     border-bottom: 1px solid #c4c4c4;
     color: #4A4A4A;
     font-weight: 700;
     padding: 6px;
+}
 #content div.panel ul.pagination > li.active {
     background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
     border-bottom: 1px solid #afafaf;
     color: #515151;
+}
 #content div.panel ul.pagination > a:hover,
 #content div.panel ul.pagination > a:active {
     background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
     border-bottom: 1px solid #afafaf;
     text-decoration: none;
+}
 #content div.panel ul.pagination > li a {
     color: inherit;
     text-decoration: inherit;
+}
 #content div.panel div.traffic div.legend {
     clear: both;
     overflow: hidden;
     border-bottom: 1px solid #ddd;
     margin: 0 0 10px;
     padding: 0 0 10px;
+}
 #content div.panel div.traffic div.legend h6 {
     float: left;
     border: none;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.traffic div.legend li {
     list-style: none;
     float: left;
     font-size: 11px;
     margin: 0;
     padding: 0 8px 0 4px;
+}
 #content div.panel div.traffic div.legend li.visits {
     border-left: 12px solid #edc240;
+}
 #content div.panel div.traffic div.legend li.pageviews {
     border-left: 12px solid #afd8f8;
+}
@@ @@ -2950,385 +2904,384 @@ div.gravatar img { @@
+}
 #content {
     clear: both;
     padding: 10px 10px 14px 10px;
+}
 #content.hover {
     padding: 55px 10px 14px 10px !important;
+}
 #content div.panel div.panel-heading div.search {
     border-left: 1px solid #576622;
+}
 #content div.panel div.panel-heading div.search > div input {
     border: 1px solid #576622;
+}
 .label,
 .btn {
     color: #515151;
     background-color: #DADADA;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #F4F4F4, #DADADA);
     border-top: 1px solid #DDD;
     border-left: 1px solid #c6c6c6;
     border-right: 1px solid #DDD;
     border-bottom: 1px solid #c6c6c6;
     outline: none;
     margin: 0px 3px 3px 0px;
     border-radius: 4px 4px 4px 4px !important;
     padding: 3px 3px 3px 3px;
     display: inline-block;
     white-space: nowrap;
+}
 .btn {
     cursor: pointer !important;
+}
 .label {
     cursor: default !important;
+}
 ul.nav-stacked {
     margin: 20px;
     color: #393939;
     font-weight: 700;
+}
 ul.nav-stacked a {
     color: inherit;
+}
 ul.nav-stacked li.active {
     list-style-type: disc
+}
 /* make .btn inputs and buttons and divs look the same */
 button.btn,
 input.btn {
     font-family: inherit;
     font-size: inherit;
     line-height: inherit;
+}
 .btn::-moz-focus-inner {
     border: 0;
     padding: 0;
+}
 .btn.badge {
     cursor: default !important;
+}
 input[disabled].btn,
 .btn.disabled {
     color: #999;
+}
 .label,
 .btn.btn-sm {
     padding: 3px 8px;
+}
 .btn.btn-xs {
     padding: 1px 5px;
+}
 .btn:focus {
     outline: none;
+}
 .btn:hover {
     text-decoration: none;
     color: #515151;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25), 0 0 3px #FFFFFF !important;
+}
 .btn.badge:hover {
     box-shadow: none !important;
+}
 .btn.disabled:hover {
     background-position: 0;
     color: #999;
     text-decoration: none;
     box-shadow: none !important;
+}
 .label.label-danger,
 .btn.btn-danger {
     color: #fff;
     background-color: #c43c35;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
     border-color: #c43c35 #c43c35 #882a25;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .label.label-primary,
 .btn.btn-primary {
     color: #fff;
     background-color: #339bb9;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
     border-color: #339bb9 #339bb9 #22697d;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .label.label-success,
 .btn.btn-success {
     color: #fff;
     background-color: #57a957;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #62c462, #57a957);
     border-color: #57a957 #57a957 #3d773d;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .label.label-warning,
 .btn.btn-warning {
     color: #fff;
     background-color: #faa732;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #fbb450, #f89406);
     border-color: #f89406 #f89406 #ad6704;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 label.disabled {
     color: #aaa;
+}
 .btn.active {
     font-weight: bold;
+}
 .alert {
     padding: 15px;
     margin: 20px 0;
     border: 1px solid transparent;
     border-radius: 4px;
+}
 .alert-success {
     color: #3c763d;
     background-color: #dff0d8;
     border-color: #d6e9c6;
+}
 .alert-info {
     color: #31708f;
     background-color: #d9edf7;
     border-color: #bce8f1;
+}
 .alert-warning {
     color: #8a6d3b;
     background-color: #fcf8e3;
     border-color: #faebcc;
+}
 .alert-danger {
     color: #a94442;
     background-color: #f2dede;
     border-color: #ebccd1;
+}
 ins, div.options a:hover {
     text-decoration: none;
+}
 img,
 #header #header-inner #quick li a:hover span.normal,
 #content div.panel div.form div.form-horizontal div.form-group div.textarea table td table td a,
 #clone_url,
 #clone_url_id
+{
     border: none;
+}
 img.icon, .right .merge img {
     vertical-align: bottom;
+}
 #header ul#logged-user,
 #content div.panel div.panel-heading ul.links,
 #content div.panel div.message div.dismiss,
 #content div.panel div.traffic div.legend ul {
     float: right;
     margin: 0;
     padding: 0;
+}
 #header #header-inner #home,
 #header #header-inner #logo,
 #content div.panel ul.left,
 #content div.panel ol.left,
 div#commit_history,
 div#legend_data, div#legend_container, div#legend_choices {
     float: left;
+}
 #header #header-inner #quick li #quick_login,
 #content #left #menu ul.closed,
 #content #left #menu li ul.collapsed,
 .yui-tt-shadow {
     display: none;
+}
 .dropdown.open .dropdown-menu,
 #content #left #menu ul.opened,
 #content #left #menu li ul.expanded {
     display: block !important;
+}
 .caret:after {
     font-family: 'kallithea';
     content: ' \23f7';           /* triangle-down */
+}
 .repo-switcher .select2-choice {
     padding: 0px 8px 1px !important;
     display: block;
     height: 100%;
+}
 .repo-switcher .select2-container,
 .repo-switcher .select2-choice,
 .repo-switcher .select2-choice span {
     background: transparent !important;
     border: 0 !important;
     box-shadow: none !important;
     color: #FFFFFF !important;
+}
 .repo-switcher .select2-arrow {
     display: none !important;
+}
 .repo-switcher-dropdown.select2-drop.select2-drop-active {
     box-shadow: none;
     color: #fff;
     background-color: #576622;
+}
 .repo-switcher-dropdown.select2-drop.select2-drop-active .select2-results .select2-highlighted {
     background-color: #6388ad;
+}
 #content div.graph {
     padding: 0 10px 10px;
     height: 450px;
+}
 #content div.panel ol.lower-roman,
 #content div.panel ol.upper-roman,
 #content div.panel ol.lower-alpha,
 #content div.panel ol.upper-alpha,
 #content div.panel ol.decimal {
     margin: 10px 24px 10px 44px;
+}
 #content div.panel div.form,
 #content div.panel div.table,
 #content div.panel div.traffic {
     position: relative;
     clear: both;
     margin: 0;
     padding: 0 20px 10px;
+}
 #content div.panel div.form div.fields,
 #content div.panel div.form div.form-horizontal,
 #login div.form-horizontal,
 #login div.form-horizontal div.form-group,
 #register div.form,
 #register div.form div.fields,
 #register div.form div.form-horizontal {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div input.error,
 #login div.form div.form-horizontal div.form-group > div input.error,
 #register div.form div.form-horizontal div.form-group > div input.error {
     background: #FBE3E4;
     border-top: 1px solid #e1b2b3;
     border-left: 1px solid #e1b2b3;
     border-right: 1px solid #FBC2C4;
     border-bottom: 1px solid #FBC2C4;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div input.success,
 #login div.form div.form-horizontal div.form-group > div input.success,
 #register div.form div.form-horizontal div.form-group > div input.success {
     background: #E6EFC2;
     border-top: 1px solid #cebb98;
     border-left: 1px solid #cebb98;
     border-right: 1px solid #c6d880;
     border-bottom: 1px solid #c6d880;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div select,
 #content div.panel table th.selected input,
 #content div.panel table td.selected input {
     margin: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div {
     margin: 10px 20px 10px 200px;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div a:hover,
 #content div.panel div.form div.form-horizontal div.form-group > div a.ui-selectmenu:hover,
 #content div.panel div.action a:hover {
     color: #000;
     text-decoration: none;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div a.ui-selectmenu-focus,
 #content div.panel div.action a.ui-selectmenu-focus {
     border: 1px solid #666;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div div.checkbox {
     clear: both;
     min-height: 12px;
     padding: 0;
     margin: 14px 0 10px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div div.checkbox input {
     float: left;
     margin: -4px 5px 0px 0px;
+}
 div.form div.form-horizontal div.form-group div.button input,
 #content div.panel div.form div.fields div.buttons input
 #content div.panel div.form div.form-horizontal div.buttons input
 div.form div.fields div.buttons input,
 div.form div.form-horizontal div.buttons input,
 #content div.panel div.action div.button input {
     font-size: 11px;
     font-weight: 700;
     margin: 0;
+}
 div.form div.form-horizontal div.form-group div.highlight,
 #content div.panel div.form div.fields div.buttons div.highlight,
 #content div.panel div.form div.form-horizontal div.buttons div.highlight {
     display: inline;
+}
 #content div.panel div.form div.fields div.buttons,
 #content div.panel div.form div.form-horizontal div.buttons,
 div.form div.fields div.buttons,
 div.form div.form-horizontal div.buttons {
     margin: 10px 10px 0 200px;
     padding: 0;
+}
 #content div.panel table td.user,
 #content div.panel table td.address {

kallithea/templates/admin/repo_groups/repo_group_add.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Add Repository Group')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository Groups'),h.url('repos_groups'))}
     &raquo;
     ${_('Add Repository Group')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('repos_groups'))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="group_name">${_('Group name')}:</label>
                 <div>
                     ${h.text('group_name',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="group_description">${_('Description')}:</label>
-                <div class="textarea-repo editor">
                 <div>
                     ${h.textarea('group_description',cols=23,rows=5)}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
                 <div>
                     ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
                 </div>
             </div>
             <div id="copy_perms" class="form-group">
                 <label class="control-label" for="group_copy_permissions">${_('Copy parent group permissions')}:</label>
                 <div>
                     ${h.checkbox('group_copy_permissions',value="True")}
                     <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         var setCopyPermsOption = function(group_val){
             if(group_val != "-1"){
                 $('#copy_perms').show();
+            }
             else{
                 $('#copy_perms').hide();
+            }
+        }
         $("#parent_group_id").select2({
             'dropdownAutoWidth': true
         });
         setCopyPermsOption($('#parent_group_id').val());
         $("#parent_group_id").on("change", function(e) {
             setCopyPermsOption(e.val);
         });
         $('#group_name').focus();
     });
 </script>
 </%def>

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ${h.form(url('update_repos_group',group_name=c.repo_group.group_name))}
 <div class="form">
     <!-- fields -->
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="group_name">${_('Group name')}:</label>
             <div>
                 ${h.text('group_name',class_='form-control')}
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="group_description">${_('Description')}:</label>
-            <div class="textarea text-area editor">
             <div>
                 ${h.textarea('group_description',cols=23,rows=5)}
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
             <div>
                 ${h.select('parent_group_id','',c.repo_groups,class_='form-control')}
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="enable_locking">${_('Enable locking')}:</label>
             <div>
                 ${h.checkbox('enable_locking',value="True")}
                 <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span>
             </div>
         </div>
         <div class="form-group">
             <div class="buttons">
                 ${h.submit('save',_('Save'),class_="btn btn-default")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 </div>
 ${h.end_form()}
 ${h.form(url('delete_repo_group', group_name=c.repo_group.group_name))}
 <div class="form">
     <div class="form-horizontal">
         <div class="form-group">
             <div class="buttons">
                 ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn btn-danger",onclick="return confirm('"+_('Confirm to delete this group')+"');")}
             </div>
         </div>
     </div>
 </div>
 ${h.end_form()}
 <script>
     $(document).ready(function(){
         $("#parent_group_id").select2({
             'dropdownAutoWidth': true
         });
     });
 </script>

kallithea/templates/admin/repos/repo_add_base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ${h.form(url('repos'))}
 <div class="form">
     <!-- fields -->
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="repo_name">${_('Name')}:</label>
             <div>
                 ${h.text('repo_name',class_='form-control')}
             </div>
          </div>
         <div id="remote_clone" class="form-group">
             <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label>
             <div>
                 ${h.text('clone_uri',class_='form-control')}
                 <span class="help-block">
                     ${_('Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL.')}
                 </span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_description">${_('Description')}:</label>
-            <div class="textarea-repo editor">
             <div>
                 ${h.textarea('repo_description')}
                 <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_group">${_('Repository group')}:</label>
             <div>
                 ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
                 <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
             </div>
         </div>
         <div id="copy_perms" class="form-group">
             <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label>
             <div>
                 ${h.checkbox('repo_copy_permissions',value="True")}
                 <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_type">${_('Type')}:</label>
             <div>
                 ${h.select('repo_type','hg',c.backends,class_='form-control')}
                 <span class="help-block">${_('Type of repository to create.')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
             <div>
                 ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')}
                 <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_private">${_('Private repository')}:</label>
             <div>
                 ${h.checkbox('repo_private',value="True")}
                 <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
             </div>
         </div>
         <div class="form-group">
             <div class="buttons">
                 ${h.submit('add',_('Add'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 </div>
 <script>
     $(document).ready(function(){
         var setCopyPermsOption = function(group_val){
             if(group_val != "-1"){
                 $('#copy_perms').show();
+            }
             else{
                 $('#copy_perms').hide();
+            }
+        }
         $("#repo_group").select2({
             'dropdownAutoWidth': true
         });
         setCopyPermsOption($('#repo_group').val());
         $("#repo_group").on("change", function(e) {
             setCopyPermsOption(e.val);
         });
         $("#repo_type").select2({
             'minimumResultsForSearch': -1
         });
         $("#repo_landing_rev").select2({
             'minimumResultsForSearch': -1
         });
         $('#repo_name').focus();
     });
 </script>
 ${h.end_form()}

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

 ${h.form(url('update_repo', repo_name=c.repo_info.repo_name))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Name')}:</label>
                 <div>
                     ${h.text('repo_name',class_='form-control')}
                     <span class="help-block">${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span>
                     <span id="clone_id" class="help-block" style="display: none">
                         ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br>
                         ${_('''In case this repository is renamed or moved into another group the repository URL changes.
                                Using the above permanent URL guarantees that this repository always will be accessible on that URL.
                                This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="clone_uri">${_('Remote repository')}:</label>
                 <div>
                   <div id="alter_clone_uri">
                         ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))}
                         ${h.hidden('clone_uri_hidden', c.repo_info.clone_uri_hidden)}
                   </div>
                   <span id="alter_clone_uri_help_block" class="help-block">
                     ${_('Optional: URL of a remote repository. If set, the repository can be pulled from this URL.')}
                   </span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_group">${_('Repository group')}:</label>
                 <div>
                     ${h.select('repo_group','',c.repo_groups,class_='form-control')}
                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
                 <div>
                     ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="owner">${_('Owner')}:</label>
                 <div class="ac">
                     <div class="perm_ac">
                        ${h.text('owner',class_='yui-ac-input')}
                        <span class="help-block">${_('Change owner of this repository.')}</span>
                        <div id="owner_container"></div>
                     </div>
                 </div>
              </div>
             <div class="form-group">
                 <label class="control-label" for="repo_description">${_('Description')}:</label>
-                <div class="textarea text-area editor">
                 <div>
                     ${h.textarea('repo_description', style="height:165px")}
                     <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_private">${_('Private repository')}:</label>
                 <div>
                     ${h.checkbox('repo_private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label>
                 <div>
                     ${h.checkbox('repo_enable_statistics',value="True")}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label>
                 <div>
                     ${h.checkbox('repo_enable_downloads',value="True")}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_enable_locking">${_('Enable locking')}:</label>
                 <div>
                     ${h.checkbox('repo_enable_locking',value="True")}
                     <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span>
                 </div>
             </div>
             %if c.visual.repository_fields:
               ## EXTRA FIELDS
               %for field in c.repo_fields:
                 <div class="form-group">
                     <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label>
                     <div>
                         ${h.text(field.field_key_prefixed, field.field_value, class_='form-control')}
                         %if field.field_desc:
                           <span class="help-block">${field.field_desc}</span>
                         %endif
                     </div>
                  </div>
               %endfor
             %endif
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 <script>
     $(document).ready(function(){
         $('#show_more_clone_id').on('click', function(e){
             $('#clone_id').show();
             e.preventDefault();
         });
         $('#repo_landing_rev').select2({
             'dropdownAutoWidth': true
         });
         $('#repo_group').select2({
             'dropdownAutoWidth': true
         });
         // autocomplete
         var _USERS_AC_DATA = ${c.users_array|n};
         SimpleUserAutoComplete($('#owner'), $('#owner_container'), _USERS_AC_DATA);
     });
 </script>

kallithea/templates/admin/user_groups/user_group_add.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Add user group')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('User Groups'),h.url('users_groups'))}
     &raquo;
     ${_('Add User Group')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('users_groups'))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                 <div>
                     ${h.text('users_group_name',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="user_group_description">${_('Description')}:</label>
-                <div class="textarea text-area editor">
                 <div>
                     ${h.textarea('user_group_description')}
                     <span class="help-block">${_('Short, optional description for this user group.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="users_group_active">${_('Active')}:</label>
                 <div>
                     ${h.checkbox('users_group_active',value=True, checked='checked')}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $('#users_group_name').focus();
     });
 </script>
 </%def>

kallithea/templates/admin/user_groups/user_group_edit_settings.html

➞

Show inline comments

 ${h.form(url('update_users_group', id=c.user_group.users_group_id), id='edit_users_group')}
     <div class="form">
         <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                     <div>
                         ${h.text('users_group_name',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="user_group_description">${_('Description')}:</label>
-                    <div class="textarea-small editor">
                     <div>
                         ${h.textarea('user_group_description')}
                         <span class="help-block">${_('Short, optional description for this user group.')}</span>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="users_group_active">${_('Active')}:</label>
                     <div>
                         ${h.checkbox('users_group_active',value=True)}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label">${_('Members')}:</label>
                     <div>
                         <table class="table">
                                 <tr>
                                     <td>
                                         <div>
                                             <div style="float:left">
                                                 <div class="text" style="padding: 0px 0px 6px;">${_('Chosen group members')}</div>
                                                 ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="min-width:210px")}
                                             </div>
                                             <div style="float:left;width:20px;padding-top:50px">
                                                 <i style="cursor:pointer; font-size: 16px" id="add_element" class="icon-left-open" title="Choose selected available"></i>
                                                 <div style="height:50px"></div>
                                                 <i style="cursor:pointer; font-size: 16px" id="remove_element" class="icon-right-open" title="Remove selected chosen"></i>
                                             </div>
                                             <div style="float:left">
                                                  <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div>
                                                  ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}
                                             </div>
                                         </div>
                                     </td>
                                 </tr>
                         </table>
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="buttons">
                         ${h.submit('Save',_('Save'),class_="btn btn-default")}
                     </div>
                 </div>
             </div>
     </div>
 ${h.end_form()}
 <script type="text/javascript">
   MultiSelectWidget('users_group_members','available_members','edit_users_group');
 </script>

kallithea/templates/forks/fork.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Fork repository %s') % c.repo_name}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Fork')}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('createfork')}
 <div class="panel panel-primary">
     <!-- box / title -->
     ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Fork name')}:</label>
                 <div>
                     ${h.text('repo_name',class_='form-control')}
                     ${h.hidden('repo_type',c.repo_info.repo_type)}
                     ${h.hidden('fork_parent_id',c.repo_info.repo_id)}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="description">${_('Description')}:</label>
-                <div class="textarea editor">
                 <div>
                     ${h.textarea('description')}
                     <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_group">${_('Repository group')}:</label>
                 <div>
                     ${h.select('repo_group','',c.repo_groups,class_='form-control')}
                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="landing_rev">${_('Landing revision')}:</label>
                 <div>
                     ${h.select('landing_rev','',c.landing_revs,class_='form-control')}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh, and readme.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="private">${_('Private')}:</label>
                 <div>
                     ${h.checkbox('private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="copy_permissions">${_('Copy permissions')}:</label>
                 <div>
                     ${h.checkbox('copy_permissions',value="True", checked="checked")}
                     <span class="help-block">${_('Copy permissions from forked repository')}</span>
                 </div>
             </div>
             %if c.can_update:
             <div class="form-group">
                 <label class="control-label" for="update_after_clone">${_('Update after clone')}:</label>
                 <div>
                     ${h.checkbox('update_after_clone',value="True")}
                     <span class="help-block">${_('Checkout source after making a clone')}</span>
                 </div>
             </div>
             %endif
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('',_('Fork this Repository'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $("#repo_group").select2({
             'dropdownAutoWidth': true
         });
         $("#landing_rev").select2({
             'minimumResultsForSearch': -1
         });
         $('#repo_name').focus();
     });
 </script>
 </%def>

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${c.repo_name} ${_('New Pull Request')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('New Pull Request')}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('showpullrequest')}
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;">
             <div class="form-group">
                 <label class="control-label" for="pullrequest_title">${_('Title')}:</label>
                 <div>
                     ${h.text('pullrequest_title',class_='form-control',placeholder=_('Summarize the changes - or leave empty'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="pullrequest_desc">${_('Description')}:</label>
-                <div class="textarea text-area editor">
                 <div>
                     ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label">${_('Changeset flow')}:</label>
                 <div>
                     ##ORG
                     <div>
                         <div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Origin repository')}:</b> <span id="org_repo_desc">${c.db_repo.description.split('\n')[0]}</span>
                             </div>
                             <div>
                             ${h.select('org_repo','',c.cs_repos,class_='refs')}:${h.select('org_ref',c.default_cs_ref,c.cs_refs,class_='refs')}
                             </div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Revision')}:</b> <span id="org_rev_span">-</span>
                             </div>
                         </div>
                     </div>
                     ##OTHER, most Probably the PARENT OF THIS FORK
                     <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">
                         <div>
                             ## filled with JS
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Destination repository')}:</b> <span id="other_repo_desc">${c.a_repo.description.split('\n')[0]}</span>
                             </div>
                             <div>
                             ${h.select('other_repo',c.a_repo.repo_name,c.a_repos,class_='refs')}:${h.select('other_ref',c.default_a_ref,c.a_refs,class_='refs')}
                             </div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Revision')}:</b> <span id="other_rev_span">-</span>
                             </div>
                         </div>
                     </div>
                     <div style="clear:both"></div>
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Create Pull Request'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
         <div style="clear:both;padding: 0 0 30px 0;"></div>
         <h4>${_('Changesets')}</h4>
         <div style="float:left;padding:0px 30px 30px 30px">
            ## overview pulled by ajax
            <div style="float:left" id="pull_request_overview"></div>
         </div>
         <div style="clear:both;"></div>
     </div>
     ${h.end_form()}
 </div>
 <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>
 <script type="text/javascript">
   pyroutes.register('pullrequest_repo_info', "${url('pullrequest_repo_info',repo_name='%(repo_name)s')}", ['repo_name']);
   var pendingajax = undefined;
   var otherrepoChanged = function(){
       var $other_ref = $('#other_ref');
       $other_ref.prop('disabled', true);
       var repo_name = $('#other_repo').val();
       if (pendingajax) {
           pendingajax.abort();
           pendingajax = undefined;
+      }
       pendingajax = ajaxGET(pyroutes.url('pullrequest_repo_info', {"repo_name": repo_name}),
           function(data){
               pendingajax = undefined;
               $('#other_repo_desc').html(data.description);
               // replace options of other_ref with the ones for the current other_repo
               $other_ref.empty();
               for(var i = 0; i < data.refs.length; i++)
+              {
                 var $optgroup = $('<optgroup/>').prop('label', data.refs[i][1]);
                 var options = data.refs[i][0];
                 var length = options.length;
                 for(var j = 0; j < length; j++)
+                {
                   $optgroup.append($('<'+'option/>').text(options[j][1]).val(options[j][0]));
+                }
                 $other_ref.append($optgroup);
+              }
               $other_ref.val(data.selected_ref);
               // re-populate the select2 thingy
               $("#other_ref").select2({
                   dropdownAutoWidth: true
               });
               $other_ref.prop('disabled', false);
               loadPreview();
           });
   };
   var loadPreview = function(){
       //url template
       var url = "${h.url('compare_url',
                          repo_name='__other_repo__',
                          org_ref_type='rev',
                          org_ref_name='__other_ref_name__',
                          other_repo='__org_repo__',
                          other_ref_type='rev',
                          other_ref_name='__org_ref_name__',
                          as_form=True,
                          merge=True,
                          )}";
       var org_repo = $('#pull_request_form #org_repo').val();
       var org_ref = $('#pull_request_form #org_ref').val().split(':');
       ## TODO: make nice link like link_to_ref() do
       $('#org_rev_span').html(org_ref[2].substr(0,12));
       var other_repo = $('#pull_request_form #other_repo').val();
       var other_ref = $('#pull_request_form #other_ref').val().split(':');
       $('#other_rev_span').html(other_ref[2].substr(0,12));
       var rev_data = {
           '__org_repo__': org_repo,
           '__org_ref_name__': org_ref[2],
           '__other_repo__': other_repo,
           '__other_ref_name__': other_ref[2]
       }; // gather the org/other ref and repo here
       for (k in rev_data){
           url = url.replace(k,rev_data[k]);
+      }
       if (pendingajax) {
           pendingajax.abort();
           pendingajax = undefined;
+      }
       pendingajax = asynchtml(url, $('#pull_request_overview'), function(o){
           pendingajax = undefined;
           var jsdata = eval('('+$('#jsdata').html()+')'); // TODO: just get json
           var r = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_');
           r.render(jsdata);
       });
+  }
   $(document).ready(function(){
       $("#org_repo").select2({
           dropdownAutoWidth: true
       });
       ## (org_repo can't change)
       $("#org_ref").select2({
           dropdownAutoWidth: true,
           maxResults: 50,
           sortResults: branchSort
       });
       $("#org_ref").on("change", function(e){
           loadPreview();
       });
       $("#other_repo").select2({
           dropdownAutoWidth: true
       });
       $("#other_repo").on("change", function(e){
           otherrepoChanged();
       });
       $("#other_ref").select2({
           dropdownAutoWidth: true,
           maxResults: 50,
           sortResults: branchSort
       });
       $("#other_ref").on("change", function(e){
           loadPreview();
       });
       //lazy load overview after 0.5s
       setTimeout(loadPreview, 500);
   });
 </script>
 </%def>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 <%block name="title">
     ${_('%s Pull Request %s') % (c.repo_name, c.pull_request.nice_id())}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Pull request %s from %s#%s') % (c.pull_request.nice_id(), c.pull_request.org_repo.repo_name, c.cs_branch_name)}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 <% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.owner_id == c.authuser.user_id) %>
 ${self.repo_context_bar('showpullrequest')}
 <div class="panel panel-primary">
   <!-- box / title -->
   <div class="panel-heading">
     ${self.breadcrumbs()}
   </div>
   ${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')}
     <div class="form pr-box" style="float: left">
       <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">
           ${_('Title')}: ${c.pull_request.title}
           %if c.pull_request.is_closed():
               (${_('Closed')})
           %endif
       </div>
       <div id="pr-summary" class="fields">
         <div class="pr-not-edit" style="min-height:37px">
             <label>${_('Description')}:</label>
             %if editable:
             <div style="margin: 25px 5px; position: absolute">
               <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
             </div>
             %endif
           <div>
             <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
           </div>
         </div>
         %if editable:
         <div class="pr-do-edit" style="display:none">
           <div>
               <label for="pullrequest_title">${_('Title')}:</label>
               <div>
                   ${h.text('pullrequest_title',class_='form-control',value=c.pull_request.title,placeholder=_('Summarize the changes'))}
               </div>
           </div>
           <div>
               <label for="pullrequest_desc">${_('Description')}:</label>
-              <div class="textarea text-area editor">
               <div>
                   ${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))}
               </div>
           </div>
         </div>
         %endif
         <div>
           <label>${_('Reviewer voting result')}:</label>
           <div>
             <div class="changeset-status-container" style="float:none;clear:both">
             %if c.current_voting_result:
               <span class="changeset-status-ico" style="padding:0px 4px 0px 0px">
                   <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span>
               <span class="changeset-status-lbl" data-toggle="tooltip" title="${_('Pull request status calculated from votes')}">
                 %if c.pull_request.is_closed():
                     ${_('Closed')},
                 %endif
                 ${h.changeset_status_lbl(c.current_voting_result)}
               </span>
             %endif
             </div>
           </div>
         </div>
         <div>
           <label>${_('Still not reviewed by')}:</label>
           <div>
             % if len(c.pull_request_pending_reviewers) > 0:
                 <div data-toggle="tooltip" title="${', '.join([x.username for x in c.pull_request_pending_reviewers])}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
             % elif len(c.pull_request_reviewers) > 0:
                 <div>${_('Pull request was reviewed by all reviewers')}</div>
             %else:
                 <div>${_('There are no reviewers')}</div>
             %endif
           </div>
         </div>
         <div>
           <label>${_('Origin')}:</label>
           <div>
             <div>
               ${h.link_to_ref(c.pull_request.org_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}
               %if c.cs_ref_type != 'branch':
                 ${_('on')} ${h.link_to_ref(c.pull_request.org_repo.repo_name, 'branch', c.cs_branch_name)}
               %endif
             </div>
           </div>
         </div>
         <div>
           <label>${_('Target')}:</label>
           <div>
             %if c.is_range:
               ${_("This is just a range of changesets and doesn't have a target or a real merge ancestor.")}
             %else:
               ${h.link_to_ref(c.pull_request.other_repo.repo_name, c.a_ref_type, c.a_ref_name)}
               ## we don't know other rev - c.a_rev is ancestor and not necessarily on other_name_branch branch
             %endif
           </div>
         </div>
         <div>
           <label>${_('Pull changes')}:</label>
           <div>
             %if c.cs_ranges:
               <div>
                ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?
                %if h.is_hg(c.pull_request.org_repo):
                  <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>
                %elif h.is_git(c.pull_request.org_repo):
                  <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>
                %endif
               </div>
             %endif
           </div>
         </div>
         <div>
           <label>${_('Created on')}:</label>
           <div>
               <div>${h.fmt_date(c.pull_request.created_on)}</div>
           </div>
         </div>
         <div>
           <label>${_('Owner')}:</label>
           <div class="pr-not-edit">
                   ${h.gravatar_div(c.pull_request.owner.email, size=20)}
                   <span>${c.pull_request.owner.full_name_and_username}</span><br/>
                   <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/>
           </div>
           <div class="pr-do-edit ac" style="display:none">
                ${h.text('owner', class_='form-control', value=c.pull_request.owner.username, placeholder=_('Username'))}
                <div id="owner_completion_container"></div>
           </div>
         </div>
         <div>
           <label>${_('Next iteration')}:</label>
             <div>
               <div class="msg-div">${c.update_msg}</div>
               %if c.avail_revs:
               <div id="updaterevs" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px; padding: 1px 0">
                 <div style="height:0;width:40px">
                   <canvas id="avail_graph_canvas" style="width:0"></canvas>
                 </div>
                 <table id="updaterevs-table" class="noborder" style="padding-left:50px">
                   %for cnt, cs in enumerate(c.avail_cs):
                     <tr id="chg_available_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 and not (editable and cs.revision in c.avail_revs) else ''}">
                       %if c.cs_ranges and cs.revision == c.cs_ranges[-1].revision:
                         <td>
                           %if editable:
                             ${h.radio(name='updaterev', value='', checked=True)}
                           %endif
                         </td>
                         <td colspan="4">${_("Current revision - no change")}</td>
                       %else:
                         <td>
                           %if editable and cs.revision in c.avail_revs:
                             ${h.radio(name='updaterev', value=cs.raw_id)}
                           %endif
                         </td>
                         <td style="width: 120px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
                         <td>
                           <div style="float: right; margin-top: -4px;">
                             %for tag in cs.tags:
                               <span class="tagtag" title="${_('Tag %s') % tag}">
                                 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                               </span>
                             %endfor
                           </div>
                           <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_text(cs.message, c.repo_name)}</div>
                         </td>
                       %endif
                     </tr>
                   %endfor
                 </table>
               </div>
               <div class="msg-div">(${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")})</div>
               %endif
               <div class="msg-div">${c.update_msg_other}</div>
             </div>
         </div>
       </div>
     </div>
     ## REVIEWERS
     <div style="float:left; border-left:1px dashed #eee">
         <div class="pr-details-title">${_('Pull Request Reviewers')}</div>
         <div id="reviewers" style="padding:0px 0px 5px 10px">
           ## members goes here !
           <div>
             %for member,status in c.pull_request_reviewers:
               <input type="hidden" value="${member.user_id}" name="org_review_members" />
             %endfor
             <ul id="review_members">
             %for member,status in c.pull_request_reviewers:
               ## WARNING: the HTML below is duplicate with
               ## kallithea/public/js/base.js
               ## If you change something here it should be reflected in the template too.
               <li id="reviewer_${member.user_id}">
                 <span class="reviewers_member">
                   <span class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}">
                       <i class="icon-circle changeset-status-${status}"></i>
                   </span>
                   ${h.gravatar(member.email, size=14)}
                   <span>
                     ${member.full_name_and_username}
                     %if c.pull_request.owner_id == member.user_id:
                       (${_('Owner')})
                     %endif
                   </span>
                   <input type="hidden" value="${member.user_id}" name="review_members" />
                   %if editable:
                   <a href="#" class="reviewer_member_remove" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
                       <i class="icon-minus-circled"></i>
                   </a>
                   %endif
                 </span>
               </li>
             %endfor
             </ul>
           </div>
           %if editable:
           <div class='ac'>
             <div class="reviewer_ac">
                ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}
                <div id="reviewers_container"></div>
             </div>
           </div>
           %endif
         </div>
         %if not c.pull_request_reviewers:
         <div class="pr-details-title">${_('Potential Reviewers')}</div>
         <div style="margin: 10px 0 10px 10px; max-width: 250px">
           <div>
             ${_('Click to add the repository owner as reviewer:')}

0 comments (0 inline, 0 general)