Bläddra i källkod

HUE-647 changed my home link and breadcrumbs

Enrico Berti 13 år sedan
förälder
incheckning
7abb4a98fe

+ 14 - 6
apps/filebrowser/src/filebrowser/templates/listdir.mako

@@ -15,7 +15,7 @@
 ## limitations under the License.
 <%!
 import datetime
-from django.template.defaultfilters import escape, stringformat, date, time
+from django.template.defaultfilters import urlencode, stringformat, filesizeformat, date, time, escape
 from desktop.views import commonheader, commonfooter
 %>
 
@@ -25,11 +25,19 @@ ${commonheader('File Browser', 'filebrowser')}
 <div class="container-fluid">
 	<h1>File Browser</h1>
 	% if breadcrumbs:
-		<ul class="breadcrumb">
-			% for breadcrumb_item in breadcrumbs:
-			<li><a href="/filebrowser/view${breadcrumb_item['url']}">${breadcrumb_item['label']}</a> <span class="divider">/</span></li>
-			% endfor
-		</ul>
+		<div class="subnav">
+		    <ul class="nav nav-pills">
+		      <li><a href="${url('filebrowser.views.view', path=urlencode(path))}?default_to_home"><i class="icon-home"></i> Home</a></li>
+		      <li>
+				<ul class="hueBreadcrumb">
+					% for breadcrumb_item in breadcrumbs:
+					<li><a href="/filebrowser/view${breadcrumb_item['url']}">${breadcrumb_item['label']}</a> <span class="divider">/</span></li>
+					% endfor
+				</ul>
+			  </li>
+		    </ul>
+		</div>
+		<br/>
 	%endif
     <div id="dirlist" class="view">
     ${dir.list_table_browser(files, path_enc, current_request_path, cwd_set)}

+ 1 - 1
apps/filebrowser/src/filebrowser/views.py

@@ -274,7 +274,7 @@ def _do_newfile_save(fs, path, data, encoding):
 def parse_breadcrumbs(path):
     breadcrumbs_parts = path.split('/')
     i = 1
-    breadcrumbs = [{'url': '', 'label': 'my home'}]
+    breadcrumbs = [{'url': '', 'label': '.'}]
     while (i < len(breadcrumbs_parts)):
         breadcrumb_url = breadcrumbs[i - 1]['url'] + '/' + breadcrumbs_parts[i]
         if breadcrumb_url != '/':

+ 17 - 0
desktop/core/static/css/jhue.css

@@ -359,6 +359,23 @@ ul.errorlist li {
 	font-style:italic;
 }
 
+.hueBreadcrumb {
+    list-style: none outside none;
+    margin: 0 0 18px;
+    padding: 9px 14px;
+}
+.hueBreadcrumb li {
+    display: inline-block;
+    text-shadow: 0 1px 0 #FFFFFF;
+}
+.hueBreadcrumb .divider {
+    color: #999999;
+    padding: 0 5px;
+}
+.hueBreadcrumb .active a {
+    color: #333333;
+}
+
 
 /*********************************************************
  * From: http://datatables.net/blog/Twitter_Bootstrap