##// END OF EJS Templates
upstream » kallithea
RSS

Clone from https://kallithea-scm.org/repos/kallithea

UI fixes...
marcink -
r1865:37b3c324 beta
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -74,17 +74,17 b' proxypass_auth_enabled = false'
74 74 ## pattern to get the issues from commit messages
75 75 ## default one used here is #1234
76 76
77 #url_pat = (?:^#|\s#)(\w+)
77 url_pat = (?:^#|\s#)(\w+)
78 78
79 79 ## server url to the issue, each {id} will be replaced with id
80 80 ## fetched from the regex
81 81
82 #issue_server = https://myissueserver.com/issue/{id}
82 issue_server = https://myissueserver.com/issue/{id}
83 83
84 84 ## prefix to add to link to indicate it's an url
85 85 ## #314 will be replaced by <issue_prefix><id>
86 86
87 #issue_prefix = #
87 issue_prefix = #
88 88
89 89
90 90 ####################################
Show file before | Show file after | Hide comments
@@ -758,8 +758,8 b' def urlify_commit(text_):'
758 758 def url_func(match_obj):
759 759 issue_id = match_obj.groups()[0]
760 760 tmpl = (
761 '<a class="%(cls)s" href="%(url)s">'
762 ' %(issue-prefix)s%(id-repr)s'
761 ' <a class="%(cls)s" href="%(url)s">'
762 '%(issue-prefix)s%(id-repr)s'
763 763 '</a>'
764 764 )
765 765 return tmpl % (
Show file before | Show file after | Hide comments
@@ -1130,7 +1130,27 b' tbody .yui-dt-editable { cursor: pointer'
1130 1130 clear: both;
1131 1131 overflow: hidden;
1132 1132 margin: 0;
1133 padding: 10px 0;
1133 padding: 5px 0;
1134 white-space: pre-wrap;
1135 }
1136 #content div.box div.expand{
1137 position:absolute;
1138 width:inherit;
1139 height:14px;
1140 font-size:14px;
1141 text-align:left;
1142 cursor: pointer;
1143 font-family: monospace;
1144 color:#003367;
1145 /*
1146 background:-webkit-gradient(linear,0% 50%,100% 50%,color-stop(0%,rgba(255,255,255,0)),color-stop(100%,rgba(255,255,255,1)));
1147 background:-webkit-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
1148 background:-moz-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
1149 background:-o-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
1150 background:-ms-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
1151 background:linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
1152 */
1153 display: none;
1134 1154 }
1135 1155
1136 1156 #content div.box div.message a {
@@ -2115,8 +2135,12 b' h3.files_location {'
2115 2135 padding: 5px !important;
2116 2136 }
2117 2137
2138 .tablerow0 {
2139 background-color: #F8F8F8;
2140 }
2141
2118 2142 .tablerow1 {
2119 background-color: #F8F8F8;
2143 background-color: #FFFFFF;
2120 2144 }
2121 2145
2122 2146 .changeset_id {
@@ -2246,7 +2270,7 b' h3.files_location {'
2246 2270 }
2247 2271
2248 2272 #graph_content #rev_range_container {
2249 padding: 5px 20px;
2273 padding: 7px 20px;
2250 2274 float: left;
2251 2275 }
2252 2276
@@ -2276,6 +2300,7 b' h3.files_location {'
2276 2300
2277 2301 #graph_content .container .left .date {
2278 2302 color: #444444;
2303 padding-left: 22px;
2279 2304 }
2280 2305
2281 2306 #graph_content .container .left .author {
@@ -2539,7 +2564,10 b' table.code-browser .browser-file {'
2539 2564 margin-left:1px;
2540 2565
2541 2566 }
2542
2567 .diffblock .diff-actions {
2568 padding: 2px 0px 0px 2px;
2569 float: left;
2570 }
2543 2571 .diffblock .diff-menu ul li {
2544 2572 padding: 0px 0px 0px 0px !important;
2545 2573 }
@@ -3987,6 +4015,7 b' div.diffblock .code-header-title{'
3987 4015 div.diffblock .code-header .date{
3988 4016 float:left;
3989 4017 text-transform: uppercase;
4018 padding: 2px 0px 0px 2px;
3990 4019 }
3991 4020 div.diffblock .code-header div{
3992 4021 margin-left:4px;
@@ -4099,4 +4128,4 b' table.code-difftable .code pre{'
4099 4128 cursor: auto !important;
4100 4129 background-color: inherit !important;
4101 4130
4102 } No newline at end of file
4131 }
Show file before | Show file after | Hide comments
@@ -63,18 +63,17 b' function BranchRenderer() {'
63 63 var rela = document.getElementById('graph');
64 64 var pad = pad;
65 65 var scale = 22;
66
66
67 67 for (var i in data) {
68 68 this.scale(scale);
69
69 70 var row = document.getElementById("chg_"+idx);
70 71 var next = document.getElementById("chg_"+idx+1);
72 if(row == null){
73 continue
74 }
71 75 var extra = 0;
72 76
73 //skip this since i don't have DATE in my app
74 //if (next.is('.changesets-date')) {
75 // extra = next.outerHeight();
76 //}
77
78 77 this.cell[1] += row.clientWidth;
79 78 this.bg[1] += this.bg_height;
80 79
@@ -82,7 +81,9 b' function BranchRenderer() {'
82 81 nodeid = cur[0];
83 82 node = cur[1];
84 83 in_l = cur[2];
85
84
85 var pos_ = 26;
86
86 87 for (var j in in_l) {
87 88
88 89 line = in_l[j];
@@ -99,8 +100,7 b' function BranchRenderer() {'
99 100 }
100 101
101 102 this.setColor(color, 0.0, 0.65);
102
103 y = row.offsetTop-rela.offsetTop+row.offsetHeight/2;
103 y = row.offsetTop-rela.offsetTop+pos_;
104 104 x = pad-((this.cell[0] + this.box_size * start - 1) + this.bg_height-2);
105 105
106 106 this.ctx.lineWidth=this.line_width;
@@ -119,7 +119,7 b' function BranchRenderer() {'
119 119 var x2 = pad-((1 + this.box_size * end) + this.bg_height-2);
120 120 var y2 = y + row.offsetHeight;
121 121 var ymid = (y+y2) / 2;
122 this.ctx.bezierCurveTo (x,ymid,x2,ymid,x2,y2);
122 this.ctx.bezierCurveTo(x,ymid,x2,ymid,x2,y2);
123 123 }
124 124 this.ctx.stroke();
125 125 }
@@ -128,7 +128,7 b' function BranchRenderer() {'
128 128 color = node[1]
129 129
130 130 radius = this.dot_radius;
131 y = row.offsetTop-rela.offsetTop+row.offsetHeight/2;
131 y = row.offsetTop-rela.offsetTop+pos_;
132 132 x = pad-(Math.round(this.cell[0] * scale/2 * column + radius) + 15 - (column*4));
133 133
134 134 this.ctx.beginPath();
Show file before | Show file after | Hide comments
@@ -44,11 +44,11 b''
44 44 </div>
45 45
46 46 %for cnt,cs in enumerate(c.pagination):
47 <div id="chg_${cnt+1}" class="container ${'tablerow1' if cnt%2==0 else 'tablerow2'}">
47 <div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
48 48 <div class="left">
49 49 <div>
50 50 ${h.checkbox(cs.short_id,class_="changeset_range")}
51 <span class="tooltip" title="${cs.date}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
51 <span class="tooltip" title="${h.age(cs.date)}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
52 52 </div>
53 53 <div class="author">
54 54 <div class="gravatar">
@@ -56,9 +56,11 b''
56 56 </div>
57 57 <div title="${cs.author}" class="user">${h.person(cs.author)}</div>
58 58 </div>
59 <div class="date">${cs.date}</div>
59 60 </div>
60 61 <div class="mid">
61 <div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
62 <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message))}</div>
63 <div class="expand ${'tablerow%s' % (cnt%2)}">&darr; ${_('show more')} &darr;</div>
62 64 </div>
63 65 <div class="right">
64 66 <div id="${cs.raw_id}_changes_info" class="changes">
@@ -132,6 +134,34 b''
132 134 }
133 135 });
134 136
137 var msgs = YUQ('.message');
138 // get firts element height;
139 var el = YUQ('.container')[0];
140 var row_h = el.clientHeight;
141 for(var i=0;i<msgs.length;i++){
142 var m = msgs[i];
143
144 var h = m.clientHeight;
145 var pad = YUD.getStyle(m,'padding');
146 if(h > row_h){
147 YUD.setStyle(m.nextElementSibling,'display','block');
148 YUD.setStyle(m.nextElementSibling,'margin-top',row_h-(h+14)+'px');
149 YUD.setAttribute(m.nextElementSibling,'expand',h);
150 };
151 }
152 YUE.on(YUQ('.expand'),'click',function(e){
153 var elem = e.currentTarget.parentElement.parentElement;
154 YUD.setStyle(e.currentTarget,'display','none');
155 YUD.setStyle(elem,'height',YUD.getAttribute(e.currentTarget,'expand')+'px');
156
157 //redraw the graph max_w and jsdata are global vars
158 set_canvas(max_w);
159
160 var r = new BranchRenderer();
161 r.render(jsdata,max_w);
162
163 })
164
135 165 // Fetch changeset details
136 166 YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){
137 167 var id = e.currentTarget.id
@@ -188,4 +218,4 b''
188 218 %endif
189 219 </div>
190 220 </div>
191 </%def> No newline at end of file
221 </%def>
Show file before | Show file after | Hide comments
@@ -27,15 +27,15 b''
27 27 <div class="table">
28 28 <div class="diffblock">
29 29 <div class="code-header">
30 <div class="date">${c.changeset.revision}:
31 ${h.link_to(h.short_id(c.changeset.raw_id),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
30 <div class="date">
31 R${c.changeset.revision}:${h.link_to(h.short_id(c.changeset.raw_id),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
32 32 ${c.changeset.date}</div>
33 <span class="diff-actions">
34 <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>
35 <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/down_16.png')}"/></a>
33 <div class="diff-actions">
34 <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
35 <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>
36 36 ${c.ignorews_url()}
37 37 ${c.context_url()}
38 </span>
38 </div>
39 39 <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
40 40 </div>
41 41 </div>
Show file before | Show file after | Hide comments
@@ -15,13 +15,13 b''
15 15 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
16 16 revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
17 17 </div>
18 <span class="diff-actions">
19 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" title="${_('diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>
20 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>
21 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/down_16.png')}"/></a>
18 <div class="diff-actions">
19 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" title="${_('diff')}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>
20 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
21 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>
22 22 ${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))}
23 23 ${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))}
24 </span>
24 </div>
25 25 <span style="float:right;margin-top:-3px">
26 26 <label>
27 27 ${_('show inline comments')}
General Comments 0
You need to be logged in to leave comments. Login now