u/ewong/rhodecode-enterprise-ce-fork Commit - r422:a5bc4f35

file-browser: fixes

marcink -

r422:a5bc4f35 default

parent child

rhodecode/templates/files/files_browser_tree.html

0 created 644 +60 0

			@@ -0,0 +1,60 b''
		1	<div class="browser-body">
		2	<table class="code-browser rctable">
		3	<thead>
		4	<tr>
		5	<th>${_('Name')}</th>
		6	<th>${_('Size')}</th>
		7	<th>${_('Modified')}</th>
		8	<th>${_('Last Commit')}</th>
		9	<th>${_('Author')}</th>
		10	</tr>
		11	</thead>
		12
		13	<tbody id="tbody">
		14	%if c.file.parent:
		15	<tr class="parity0">
		16	<td class="td-componentname">
		17	<a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.file.parent.path)}" class="pjax-link">
		18	<i class="icon-folder"></i>..
		19	</a>
		20	</td>
		21	<td></td>
		22	<td></td>
		23	<td></td>
		24	<td></td>
		25	</tr>
		26	%endif
		27	%for cnt,node in enumerate(c.file):
		28	<tr class="parity${cnt%2}">
		29	<td class="td-componentname">
		30	%if node.is_submodule():
		31	<span class="submodule-dir">
		32	${h.link_to_if(
		33	node.url.startswith('http://') or node.url.startswith('https://'),
		34	node.name,node.url)}
		35	</span>
		36	%else:
		37	<a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=h.safe_unicode(node.path))}" class="pjax-link">
		38	<i class="${'icon-file browser-file' if node.is_file() else 'icon-folder browser-dir'}"></i>${node.name}
		39	</a>
		40	%endif
		41	</td>
		42	%if node.is_file():
		43	<td class="td-size" title="${'size-%s' % node.name}"></td>
		44	<td class="td-time" title="${'modified_at-%s' % node.name}">
		45	<span class="browser-loading">${_('Loading...')}</span>
		46	</td>
		47	<td class="td-hash" title="${'revision-%s' % node.name}"></td>
		48	<td class="td-user" title="${'author-%s' % node.name}"></td>
		49	%else:
		50	<td></td>
		51	<td></td>
		52	<td></td>
		53	<td></td>
		54	%endif
		55	</tr>
		56	%endfor
		57	</tbody>
		58	<tbody id="tbody_filtered"></tbody>
		59	</table>
		60	</div> No newline at end of file

rhodecode/controllers/files.py

0 +1 -1

                      def _cached_tree():
                          log.debug('Generating cached file tree for %s, %s, %s',
                                    repo_name, commit_id, f_path)
-                         return render('files/files_browser.html')
+                         return render('files/files_browser_tree.html')
                      cache_manager = self.__get_tree_cache_manager(
                          repo_name, caches.FILE_TREE)

rhodecode/templates/files/files_browser.html

0 +2 -60

		@@ -41,67 +41,9 b''
41	41	</div>
42	42	</div>
43	43	</div>
44
45		<div class="browser-body">
46		<table class="code-browser rctable">
47		<thead>
48		<tr>
49		<th>${_('Name')}</th>
50		<th>${_('Size')}</th>
51		<th>${_('Modified')}</th>
52		<th>${_('Last Commit')}</th>
53		<th>${_('Author')}</th>
54		</tr>
55		</thead>
	44	## file tree is computed from caches, and filled in
	45	${c.file_tree}
56	46
57		<tbody id="tbody">
58		%if c.file.parent:
59		<tr class="parity0">
60		<td class="td-componentname">
61		<a href='${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.file.parent.path)}' class="pjax-link">
62		<i class="icon-folder"></i>..
63		</a>
64		</td>
65		<td></td>
66		<td></td>
67		<td></td>
68		<td></td>
69		</tr>
70		%endif
71		%for cnt,node in enumerate(c.file):
72		<tr class="parity${cnt%2}">
73		<td class="td-componentname">
74		%if node.is_submodule():
75		<span class="submodule-dir">
76		${h.link_to_if(
77		node.url.startswith('http://') or node.url.startswith('https://'),
78		node.name,node.url)}
79		</span>
80		%else:
81		<a href='${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=h.safe_unicode(node.path))}' class="pjax-link">
82		<i class="${"icon-file browser-file" if node.is_file() else "icon-folder browser-dir"}"></i>${node.name}
83		</a>
84		%endif
85		</td>
86		%if node.is_file():
87		<td class="td-size" title="${'size-%s' % node.name}"></td>
88		<td class="td-time" title="${'modified_at-%s' % node.name}">
89		<span class="browser-loading">${_('Loading...')}</span>
90		</td>
91		<td class="td-hash" title="${'revision-%s' % node.name}"></td>
92		<td class="td-user" title="${'author-%s' % node.name}"></td>
93		%else:
94		<td></td>
95		<td></td>
96		<td></td>
97		<td></td>
98		%endif
99		</tr>
100		%endfor
101		</tbody>
102		<tbody id="tbody_filtered"></tbody>
103		</table>
104		</div>
105	47	</div>
106	48
107	49	<script>

rhodecode/templates/files/files_pjax.html

0 +1 -1

                          <%include file='file_tree_author_box.html'/>
                      </div>
-                     ${c.file_tree}
+                     <%include file='files_browser.html'/>
                  % else:
                      <div id="file_authors" class="sidebar-right">
                          <%include file='file_authors_box.html'/>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages