Просмотр исходного кода

HUE-1022 [core] Introduce Font Awesome instead of Glyphicons

Added Font Awesome 3.0.2
Enrico Berti 13 лет назад
Родитель
Сommit
e38e76618f

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/fb_components.mako

@@ -20,7 +20,7 @@ from django.utils.translation import ugettext as _
 <%def name="breadcrumbs(path, breadcrumbs, from_listdir=False)">
     % if from_listdir:
         <ul class="nav nav-pills hueBreadcrumbBar">
-            <li><a href="${url('filebrowser.views.view', path=urlencode(path))}?default_to_home"><i class="icon-home"></i> ${_('Home')}</a></li>
+            <li><a href="${url('filebrowser.views.view', path=urlencode(path))}?default_to_home" style="line-height:18px"><i class="icon-home"></i> ${_('Home')}</a></li>
             <li>
                 <span style="float:right; margin-top:10px;"><i id="editBreadcrumb" class="icon-pencil hand" rel="tooltip" title="${_('Edit path')}"></i></span>
                 <ul class="hueBreadcrumb" data-bind="foreach: breadcrumbs" style="padding-right:40px">

+ 2 - 2
apps/filebrowser/src/filebrowser/templates/listdir.mako

@@ -52,7 +52,7 @@ ${ commonheader(_('File Browser'), 'filebrowser', user) | n,unicode }
                 <span class="caret"></span>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="#" class="upload-link" title="${_('Files')}" data-bind="click: uploadFile"><i class="icon-file"></i> ${_('Files')}</a></li>
+                <li><a href="#" class="upload-link" title="${_('Files')}" data-bind="click: uploadFile"><i class="icon-file-alt"></i> ${_('Files')}</a></li>
                 <li><a href="#" class="upload-link" title="${_('Archive')}" data-bind="click: uploadArchive"><i class="icon-gift"></i> ${_('Zip file')}</a></li>
               </ul>
             </div>
@@ -62,7 +62,7 @@ ${ commonheader(_('File Browser'), 'filebrowser', user) | n,unicode }
                 <span class="caret"></span>
               </a>
               <ul class="dropdown-menu" style="top: auto">
-                <li><a href="#" class="create-file-link" title="${_('File')}"><i class="icon-file"></i> ${_('File')}</a></li>
+                <li><a href="#" class="create-file-link" title="${_('File')}"><i class="icon-file-alt"></i> ${_('File')}</a></li>
                 <li><a href="#" class="create-directory-link" title="${_('Directory')}"><i class="icon-folder-close"></i> ${_('Directory')}</a></li>
               </ul>
             </div>

+ 6 - 2
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -99,11 +99,11 @@ from django.utils.translation import ugettext as _
     </table>
 
     <script id="fileTemplate" type="text/html">
-        <tr style="cursor: pointer">
+        <tr style="cursor: pointer" data-bind="event: { mouseover: toggleHover, mouseout: toggleHover}">
             <td class="center" data-bind="click: handleSelect" style="cursor: default">
                 <div data-bind="visible: name != '..', css: {hueCheckbox: name != '..', 'icon-ok': selected}"></div>
             </td>
-            <td data-bind="click: $root.viewFile" class="left"><i data-bind="css: {'icon-file': type == 'file', 'icon-folder-close': type != 'file'}"></i></td>
+            <td data-bind="click: $root.viewFile" class="left"><i data-bind="css: {'icon-file-alt': type == 'file', 'icon-folder-close': type != 'file', 'icon-folder-open': type != 'file' && hovered}"></i></td>
             <td data-bind="click: $root.viewFile">
                 <strong><a href="#" data-bind="click: $root.viewFile, text: name"></a></strong>
             </td>
@@ -696,6 +696,10 @@ from django.utils.translation import ugettext as _
         selected:ko.observable(false),
         handleSelect:function (row, e) {
           this.selected(!this.selected());
+        },
+        hovered:ko.observable(false),
+        toggleHover:function (row, e) {
+          this.hovered(!this.hovered());
         }
       }
     }

+ 1 - 0
desktop/core/src/desktop/templates/common_header.mako

@@ -30,6 +30,7 @@ from django.utils.translation import ugettext as _
   <meta name="author" content="">
 
   <link href="/static/ext/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/static/ext/css/font-awesome.min.css" rel="stylesheet">
   <link href="/static/css/hue2.css" rel="stylesheet">
   <link href="/static/ext/css/fileuploader.css" rel="stylesheet">
 

Разница между файлами не показана из-за своего большого размера
+ 32 - 0
desktop/core/static/ext/css/font-awesome.min.css


BIN
desktop/core/static/ext/font/FontAwesome.otf


BIN
desktop/core/static/ext/font/fontawesome-webfont.eot


Разница между файлами не показана из-за своего большого размера
+ 195 - 0
desktop/core/static/ext/font/fontawesome-webfont.svg


BIN
desktop/core/static/ext/font/fontawesome-webfont.ttf


BIN
desktop/core/static/ext/font/fontawesome-webfont.woff


Некоторые файлы не были показаны из-за большого количества измененных файлов