##// END OF EJS Templates
added compare option into bookmarks
marcink -
r3798:574825da beta
parent child Browse files
Show More
@@ -22,13 +22,27 b''
22 ${self.breadcrumbs()}
22 ${self.breadcrumbs()}
23 </div>
23 </div>
24 <!-- end box / title -->
24 <!-- end box / title -->
25 %if c.repo_bookmarks:
26 <div class="info_box" id="compare_bookmarks" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="ui-btn small">${_('Compare bookmarks')}</a></div>
27 %endif
25 <div class="table">
28 <div class="table">
26 <%include file='bookmarks_data.html'/>
29 <%include file='bookmarks_data.html'/>
27 </div>
30 </div>
28 </div>
31 </div>
29
32
30 <script type="text/javascript">
33 <script type="text/javascript">
34 YUE.on('compare_bookmarks','click',function(e){
35 YUE.preventDefault(e);
36 var org = YUQ('input[name=compare_org]:checked')[0];
37 var other = YUQ('input[name=compare_other]:checked')[0];
31
38
39 if(org && other){
40 var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='book',org_ref='__ORG__',other_ref_type='book',other_ref='__OTHER__')}";
41 var u = compare_url.replace('__ORG__',org.value)
42 .replace('__OTHER__',other.value);
43 window.location=u;
44 }
45 });
32 // main table sorting
46 // main table sorting
33 var myColumnDefs = [
47 var myColumnDefs = [
34 {key:"name",label:"${_('Name')}",sortable:true},
48 {key:"name",label:"${_('Name')}",sortable:true},
@@ -37,6 +51,7 b' var myColumnDefs = ['
37 {key:"author",label:"${_('Author')}",sortable:true},
51 {key:"author",label:"${_('Author')}",sortable:true},
38 {key:"revision",label:"${_('Revision')}",sortable:true,
52 {key:"revision",label:"${_('Revision')}",sortable:true,
39 sortOptions: { sortFunction: revisionSort }},
53 sortOptions: { sortFunction: revisionSort }},
54 {key:"compare",label:"${_('Compare')}",sortable:false,},
40 ];
55 ];
41
56
42 var myDataSource = new YAHOO.util.DataSource(YUD.get("bookmarks_data"));
57 var myDataSource = new YAHOO.util.DataSource(YUD.get("bookmarks_data"));
@@ -49,6 +64,7 b' myDataSource.responseSchema = {'
49 {key:"date"},
64 {key:"date"},
50 {key:"author"},
65 {key:"author"},
51 {key:"revision"},
66 {key:"revision"},
67 {key:"compare"},
52 ]
68 ]
53 };
69 };
54
70
@@ -7,6 +7,7 b''
7 <th class="left">${_('Date')}</th>
7 <th class="left">${_('Date')}</th>
8 <th class="left">${_('Author')}</th>
8 <th class="left">${_('Author')}</th>
9 <th class="left">${_('Revision')}</th>
9 <th class="left">${_('Revision')}</th>
10 <th class="left">${_('Compare')}</th>
10 </tr>
11 </tr>
11 </thead>
12 </thead>
12 %for cnt,book in enumerate(c.repo_bookmarks.items()):
13 %for cnt,book in enumerate(c.repo_bookmarks.items()):
@@ -24,6 +25,10 b''
24 <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id)}">r${book[1].revision}:${h.short_id(book[1].raw_id)}</a></pre>
25 <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id)}">r${book[1].revision}:${h.short_id(book[1].raw_id)}</a></pre>
25 </div>
26 </div>
26 </td>
27 </td>
28 <td>
29 <input class="branch-compare" type="radio" name="compare_org" value="${book[0]}"/>
30 <input class="branch-compare" type="radio" name="compare_other" value="${book[0]}"/>
31 </td>
27 </tr>
32 </tr>
28 %endfor
33 %endfor
29 </table>
34 </table>
General Comments 0
You need to be logged in to leave comments. Login now