kallithea Changeset - 18e63f0ee80e

Changeset - 18e63f0ee80e

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2017-01-06 01:43:50
mads@kiilerich.com

templates: form inside h5 is not valid html

Make journal.html do the same as admin.html does.

2 files changed with 1 insertions and 11 deletions:

kallithea/public/css/style.css

kallithea/templates/journal/journal.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -161,776 +161,768 @@ code, @@
 div.readme .readme_box pre,
 div.rst-block pre,
 div.formatted-fixed,
 #changeset_content div.message,
 .CodeMirror .CodeMirror-code pre {
     font-size: 12px;
     font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 div.formatted-fixed {
     white-space: pre-wrap;
+}
 .changeset_hash {
     font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 .top-left-rounded-corner {
     border-top-left-radius: 8px;
+}
 .top-right-rounded-corner {
     border-top-right-radius: 8px;
+}
 .bottom-left-rounded-corner {
     border-bottom-left-radius: 8px;
+}
 .bottom-right-rounded-corner {
     border-bottom-right-radius: 8px;
+}
 .top-left-rounded-corner-mid {
     border-top-left-radius: 4px;
+}
 .top-right-rounded-corner-mid {
     border-top-right-radius: 4px;
+}
 .bottom-left-rounded-corner-mid {
     border-bottom-left-radius: 4px;
+}
 .bottom-right-rounded-corner-mid {
     border-bottom-right-radius: 4px;
+}
 .help-block {
     color: #999999;
     display: block;
     margin: 0 0 10px;
+}
 .empty_data {
     color: #B9B9B9;
+}
 .inline-comments-general.show-general-status .hidden.general-only {
     display: block !important;
+}
 /* Bootstrap compatible */
 .show {
     display: block !important;
+}
 .hidden {
     display: none !important;
+}
 .invisible {
     visibility: hidden;
+}
 .truncate {
        white-space: nowrap;
        overflow: hidden;
        text-overflow: ellipsis;
     -o-text-overflow: ellipsis;
     -ms-text-overflow: ellipsis;
+}
 .truncate.autoexpand:hover {
     overflow: visible;
+}
 a.permalink {
     visibility: hidden;
     position: absolute;
     margin: 3px 4px;
+}
 a.permalink:hover {
     text-decoration: none;
+}
 h1:hover > a.permalink,
 h2:hover > a.permalink,
 h3:hover > a.permalink,
 h4:hover > a.permalink,
 h5:hover > a.permalink,
 h6:hover > a.permalink,
 div:hover > a.permalink,
 div:hover > span > a.permalink {
     visibility: visible;
+}
 #header #logo {
     padding-left: 10px;
+}
 div.header img {
     padding-top: 5px;
+}
 #header #logo div.header,
 #header #logo div.branding {
     font-size: 20px;
     color: white;
     float: left;
     height: 44px;
     line-height: 44px;
     margin-right: 5px;
+}
 #header ul#logged-user {
     margin-bottom: 5px !important;
     border-radius: 0px 0px 8px 8px;
     height: 37px;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #header ul#logged-user li {
     list-style: none;
     float: left;
     margin: 8px 0 0;
     padding: 4px 12px;
     border-left: 1px solid #576622;
+}
 #header ul#logged-user li.first {
     border-left: none;
     margin: 4px;
+}
 #header ul#logged-user li.first div.gravatar {
     margin-top: -2px;
+}
 #header ul#logged-user li.first div.account {
     padding-top: 4px;
     float: left;
+}
 #header ul#logged-user li.last {
     border-right: none;
+}
 #header ul#logged-user li a {
     color: #fff;
     font-weight: 700;
     text-decoration: none;
+}
 #header ul#logged-user li a:hover {
     text-decoration: underline;
+}
 #header ul#logged-user li.highlight a {
     color: #fff;
+}
 #header ul#logged-user li.highlight a:hover {
     color: #FFF;
+}
 #header-dd {
     clear: both;
     position: fixed !important;
     background-color: #577632;
     opacity: 0.01;
     cursor: pointer;
     min-height: 10px;
     width: 100% !important;
     border-radius: 0px 0px 4px 4px;
+}
 #header-dd:hover {
     opacity: 0.2;
     transition: opacity 0.5s ease-in-out;
+}
 #header #header-inner {
     min-height: 44px;
     clear: both;
     position: relative;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     margin: 0;
     padding: 0;
     display: block;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     border-radius: 0px 0px 4px 4px;
+}
 #header #header-inner.hover {
     width: 100% !important;
     border-radius: 0px 0px 0px 0px;
     position: fixed !important;
     z-index: 10000;
+}
 .header-pos-fix, .anchor {
     margin-top: -46px;
     padding-top: 46px;
+}
 #header #header-inner #home a {
     height: 40px;
     width: 46px;
     display: block;
     background-position: 0 0;
     margin: 0;
     padding: 0;
+}
 #header #header-inner #home a:hover {
     background-position: 0 -40px;
+}
 #header #header-inner #logo {
     float: left;
     position: absolute;
+}
 #header #header-inner #logo h1 {
     color: #FFF;
     font-size: 20px;
     margin: 12px 0 0 13px;
     padding: 0;
+}
 #header #header-inner #logo a {
     color: #fff;
     text-decoration: none;
+}
 #header #header-inner #logo a:hover {
     color: #bfe3ff;
+}
 #header #header-inner #quick {
     position: relative;
     float: right;
     list-style-type: none;
     list-style-position: outside;
     margin: 4px 8px 0 0;
     padding: 0;
     border-radius: 4px;
+}
 #header #header-inner #quick li span.short {
     padding: 9px 6px 8px 6px;
+}
 #header #header-inner #quick li span {
     display: inline;
     margin: 0;
+}
 #header #header-inner #quick li span.normal {
     border: none;
     padding: 10px 12px 8px;
+}
 #header #header-inner #quick li .icon {
     border-left: none;
     padding-left: 10px;
+}
 #header #header-inner #quick li .icon_short {
     top: 0;
     left: 0;
     border-left: none;
     border-right: 1px solid #2e5c89;
     padding: 8px 6px 4px;
+}
 #header #header-inner #quick li .icon img,
 #header #header-inner #quick li .icon_short img {
     vertical-align: middle;
     margin-bottom: 2px;
+}
 #header #header-inner #quick ul.repo_switcher {
     max-height: 275px;
     overflow-x: hidden;
     overflow-y: auto;
+}
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs {
     padding: 2px 3px;
     padding-right: 17px;
+}
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs input {
     width: 100%;
     border-radius: 10px;
     padding: 2px 7px;
+}
 #header #header-inner #quick .repo_switcher_type {
     position: absolute;
     left: 0;
     top: 9px;
     margin: 0px 2px 0px 2px;
+}
 .groups_breadcrumbs a {
     color: #fff;
+}
 .groups_breadcrumbs a:hover {
     color: #bfe3ff;
     text-decoration: none;
+}
 .dt_repo {
     white-space: nowrap;
     color: #577632;
+}
 .dt_repo_pending {
     opacity: 0.5;
+}
 .dt_repo i.icon-keyhole-circled,
 .dt_repo i.icon-globe
+{
     font-size: 16px;
     vertical-align: -2px;
     margin: 0px 1px 0px 3px;
+}
 .dt_repo a {
     text-decoration: none;
+}
 .dt_repo .dt_repo_name:hover {
     text-decoration: underline;
+}
 #content #left {
     left: 0;
     width: 280px;
     position: absolute;
+}
 #content #right {
     margin: 0 60px 10px 290px;
+}
 #content div.panel {
     clear: both;
     background: #fff;
     margin: 0 0 10px;
     padding: 0 0 10px;
     border-radius: 4px 4px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #content div.panel div.panel-heading {
     clear: both;
     overflow: hidden;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     margin: 0 0 20px;
     padding: 0;
     border-radius: 4px 4px 0 0;
+}
 #content div.panel div.panel-heading h5 {
     float: left;
     border: none;
     color: #fff;
     margin: 0;
     padding: 11px 0 11px 10px;
+}
 #content div.panel div.panel-heading .link-white {
     color: #FFFFFF;
+}
 #content div.panel div.panel-heading .link-white.current {
     color: #BFE3FF;
+}
 #content div.panel div.panel-heading ul.links li {
     list-style: none;
     float: left;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.panel-heading ul.links li a {
     font-size: 13px;
     font-weight: 700;
     height: 1%;
     margin: 4px;
     text-decoration: none;
+}
 #content div.panel div.panel-heading ul.links.nav-tabs li a {
     float: left;
     color: #fff;
     margin: 0;
     padding: 11px 10px 11px 10px;
+}
 #content div.panel div.panel-heading ul.links.icon-only-links li a {
     float: left;
     color: #fff;
     margin: 0;
     padding: 11px 10px 11px 10px;
+}
 #content div.panel h1,
 #content div.panel h2,
 #content div.panel h3,
 #content div.panel h4,
 #content div.panel h5,
 #content div.panel h6,
 #content div.panel div.h1,
 #content div.panel div.h2,
 #content div.panel div.h3,
 #content div.panel div.h4,
 #content div.panel div.h5,
 #content div.panel div.h6 {
     clear: both;
     overflow: hidden;
     margin: 8px 20px 3px;
     padding-bottom: 2px;
+}
 #content div.panel div.normal-indent {
     margin: 0 20px 10px 20px;
+}
 #content div.panel p {
     color: #5f5f5f;
     font-size: 12px;
     line-height: 150%;
     margin: 0 24px 10px;
     padding: 0;
+}
 #content div.panel blockquote {
     border-left: 4px solid #DDD;
     color: #5f5f5f;
     font-size: 11px;
     line-height: 150%;
     margin: 0 34px;
     padding: 0 0 0 14px;
+}
 #content div.panel blockquote p {
     margin: 10px 0;
     padding: 0;
+}
 #content div.panel dl {
     margin: 10px 0px;
+}
 #content div.panel dt {
     font-size: 12px;
     margin: 0;
+}
 #content div.panel dd {
     font-size: 12px;
     margin: 0;
     padding: 8px 0 8px 15px;
+}
 #content div.panel li {
     font-size: 12px;
     padding: 4px 0;
+}
 #content div.panel ul.disc,
 #content div.panel ul.circle {
     margin: 10px 24px 10px 38px;
+}
 #content div.panel ul.square {
     margin: 10px 24px 10px 40px;
+}
 #content div.panel img.left {
     border: none;
     float: left;
     margin: 10px 10px 10px 0;
+}
 #content div.panel img.right {
     border: none;
     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 > label > input[type=text],
 #content div.panel div.form div.form-horizontal div.form-group > label > input[type=password],
 #content div.panel div.form div.form-horizontal div.form-group > div input[type=text],
 #content div.panel div.form div.form-horizontal div.form-group > div input[type=password],
 #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.form-inline,
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline,
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline {
     display: inline;
+}
 #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.form-inline select.form-control,
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline div.form-control.select2-container,
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline input.form-control {
     width: inherit;
+}
 #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;

kallithea/templates/journal/journal.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Journal')}
 </%block>
 <%def name="breadcrumbs()">
     <h5>
 <%def name="breadcrumbs_links()">
     <form id="filter_form" class="form-inline">
     <input class="form-control q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>
     <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span>
     <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/>
     ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
     </form>
     </h5>
 </%def>
 <%block name="header_menu">
     ${self.menu('journal')}
 </%block>
 <%block name="head_extra">
   <link href="${h.url('journal_atom', api_key=c.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
   <link href="${h.url('journal_rss', api_key=c.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
 </%block>
 <%def name="main()">
     <div class="panel panel-primary">
         <!-- box / title -->
         <div class="panel-heading clearfix">
          ${self.breadcrumbs()}
          <ul class="links icon-only-links">
            <li>
              <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i> ${_('Watched Repositories')}</a>
            </li>
            <li>
              <a href="${h.url('my_account_repos')}"><i class="icon-database"></i> ${_('My Repositories')}</a>
            </li>
            <li>
              <span><a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a></span>
            </li>
            <li>
              <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a></span>
            </li>
          </ul>
         </div>
         <div id="journal">
             <%include file='journal_data.html'/>
         </div>
     </div>
 <script type="text/javascript">
     $('#j_filter').click(function(){
         var $jfilter = $('#j_filter');
         if($jfilter.hasClass('initial')){
             $jfilter.val('');
+        }
     });
     var fix_j_filter_width = function(len){
         $('#j_filter').css('width', Math.max(80, len*6.50)+'px');
     };
     $('#j_filter').keyup(function(){
         fix_j_filter_width($('#j_filter').val().length);
     });
     $('#filter_form').submit(function(e){
         e.preventDefault();
         var val = $('#j_filter').val();
         window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val);
     });
     fix_j_filter_width($('#j_filter').val().length);
     $('#refresh').click(function(e){
         asynchtml("${h.url.current(filter=c.search_term)}", $("#journal"), function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
             });
         e.preventDefault();
     });
 </script>
 <script type="text/javascript">
     $(document).ready(function(){
         var $journal = $('#journal');
         $journal.on('click','.pager_link',function(e){
             asynchtml(e.target.href, $journal, function(){
                 show_more_event();
                 tooltip_activate();
                 show_changeset_tooltip();
             });
             e.preventDefault();
         });
         $('#journal').on('click','.show_more',function(e){
             var el = e.target;
             $('#'+el.id.substring(1)).show();
             $(el.parentNode).hide();
         });
     });
 </script>
 </%def>

0 comments (0 inline, 0 general)