font-awesome on left menu

LICENSES/SIL Open Font License.txt

@@ -0,0 +1,41 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

app/views/admin/index.scala.html

@@ -29,6 +29,7 @@
 	<link href="css/charisma-app.css" rel="stylesheet">
 	<link href="css/social-buttons.css" rel="stylesheet">
 	<link href='css/baasbox.css' rel='stylesheet'>
+	<link href='css/font-awesome.min.css' rel='stylesheet'>
 	<link rel="stylesheet" type="text/css" href="css/baasbox-jsnippet.css" />
 
 

app/views/admin/main_/content_/assets_/assets.scala.html

@@ -1,6 +1,6 @@
 				<div class="box span11">
 					<div data-rel="tooltip" title="The list of the public assets"  class="box-header well" >
-						<h2><i class="icon-book"></i> Assets</h2>
+						<h2><i class="fa fa-file-image-o fa-fw black"></i> Assets</h2>
 						<div class="box-icon">
 							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
 					</div>

app/views/admin/main_/content_/collections_/collections.scala.html

@@ -6,7 +6,7 @@
 				</p>
 				<div class="box span11">
 					<div class="box-header well" >
-						<h2><i class="icon-book"></i> Collections</h2>
+						<h2><i class="fa fa-files-o fa-fw black"></i> Collections</h2>
 						<div class="box-icon">
 							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
 					</div>

app/views/admin/main_/content_/documents_/chooseCollection.scala.html

@@ -1,6 +1,6 @@
 				<div class="box span6">
 					<div class="box-header well" >
-						<h2><i class="icon-book"></i> Collections</h2>
+						<h2><i class="fa fa-files-o fa-fw black"></i> Collections</h2>
 						<div class="box-icon">
 							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
 						</div>

app/views/admin/main_/content_/documents_/documents.scala.html

@@ -1,6 +1,6 @@
 				<div class="box span11">
 					<div data-rel="tooltip" title="These are the objects belonging to the selected collection." class="box-header well" >
-						<h2><i class="icon-book"></i> {{collectionName}}</h2>
+						<h2><span ng-show="collectionName"><i class="fa fa-file fa-fw black"></i> {{collectionName}}</span><span ng-show="!collectionName">...please select a collection...</span></h2>
 						<div class="box-icon">
 							<a href="#" id="btnReloadDocuments" title="Reload table" class="btn btn-setting btn-round"><i class="icon-refresh"></i></a>
 							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>

app/views/admin/main_/content_/files_/files.scala.html

@@ -1,6 +1,6 @@
 				<div class="box span11">
 					<div data-rel="tooltip" title="The list of the public files"  class="box-header well" >
-						<h2><i class="icon-book"></i> Files</h2>
+						<h2><i class="fa fa-save fa-fw black"></i> Files</h2>
 						<div class="box-icon">
 							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
 					</div>

app/views/admin/main_/content_/permissions_/permissions.scala.html

@@ -3,7 +3,7 @@
 </p>
 <div class="box span11">
     <div class="box-header well">
-        <h2><i class="icon-lock"></i> Api Access</h2>
+        <h2><i class="fa fa-key fa-fw black"></i> Api Access</h2>
         <div class="box-icon">
             <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
         </div>

app/views/admin/main_/content_/scripts.scala.html

@@ -41,7 +41,7 @@
 				<!-- plugins  -->
 				<div class="box span3">
 					<div data-rel="tooltip" title="Installed Plugins" class="box-header well" data-original-title>
-						<h2><i class="icon icon-darkgray icon-archive"></i> Installed Plugins</h2>
+						<h2><i class="fa fa-puzzle-piece fa-fw black"></i> Installed Plugins</h2>
 						<div class="box-icon">
 							<a href="#" id="btnReloadPlugins" ng-click="reload()" title="Reload plugins list" class="btn btn-setting btn-round"><i class="icon-refresh"></i></a>
 						</div>
@@ -60,7 +60,7 @@ <h2><i class="icon icon-darkgray icon-archive"></i> Installed Plugins</h2>
 				<!-- editor -->
 					<div class="box span8">
 						<div class="box-header well" data-original-title>
-							<h2><i class="icon icon-darkgray icon-book"></i><span>{{currentScript.name}}</span> &nbsp; <span class="red" ng-show="currentScript.buffer!=currentScript.code[0]"> (not saved yet) </span></h2>
+							<h2><i class="fa fa-code fa-fw black"></i><span>{{currentScript.name}}</span> &nbsp; <span class="red" ng-show="currentScript.buffer!=currentScript.code[0]"> (not saved yet) </span></h2>
 							<div ng-show="currentScript" class="box-icon">
 								<a href="#" id="btnToggleEdit" ng-click="toggleEdit()" title="Edit/View mode" class="btn btn-setting btn-round"><i class="icon-edit"></i></a>
 							</div>
@@ -106,7 +106,7 @@ <h2><i class="icon icon-darkgray icon-book"></i><span>{{currentScript.name}}</sp
 				<div class="span3">&nbsp;</div>
 				<div class="box span8">
 					<div class="box-header well">
-						<h2><i class="icon icon-darkgray icon-clipboard"></i><span>Plugins Log - (<span ng-show="!logEnabled">Not</span> Enabled)</span></h2>
+						<h2><i class="fa fa-list-ul fa-fw black"></i><span>Plugins Log - (<span ng-show="!logEnabled">Not</span> Enabled)</span></h2>
 						<div class="box-icon">
 							<a href="#" id="btnToggleLogs" ng-click="toggleLogs()" title="Show/Hide logger" class="btn btn-setting btn-round"><i class="icon-eye-open"></i></a>
 						</div>

app/views/admin/main_/content_/users_/roles.scala.html

@@ -5,7 +5,7 @@
 				</p>
 				<div class="box span11">
 					<div data-rel="tooltip" title="Roles currently managed by BaasBox" class="box-header well" >
-						<h2><i class="icon-user"></i> Roles</h2>
+						<h2><i class="fa fa-users fa-fw black"></i> Roles</h2>
 						<div class="box-icon">
 							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
 						</div>

app/views/admin/main_/content_/users_/users.scala.html

@@ -7,7 +7,7 @@
 				</p>
 				<div class="box span11">
 					<div data-rel="tooltip" title="Users currently managed by BaasBox" class="box-header well" >
-						<h2><i class="icon-user"></i> Users</h2>
+						<h2><i class="fa fa-user fa-fw black"></i> Users</h2>
 						<div class="box-icon">
 							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
 					</div>

app/views/admin/main_/leftmenu.scala.html

@@ -4,31 +4,30 @@
 			  <div class="leftbar-menu">	
 				<div class="well nav-collapse sidebar-nav">
 					<ul class="nav nav-tabs nav-stacked main-menu">
-							<li data-rel="tooltip" title="Shows general information and statistics about the BaasBox status"><a class="ajax-link" href="#dashboard"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
+							<li data-rel="tooltip" title="Shows general information and statistics about the BaasBox status"><a class="ajax-link" href="#dashboard"><i class="fa fa-home fa-fw"></i><span class="hidden-tablet"> Dashboard</span></a></li>
 						<li class="nav-header hidden-tablet">General</li>
-							<li data-rel="tooltip" title="Get/Set many configuration paramenters about BaasBox and your App"><a class="ajax-link" href="#settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></li>
-                            <li data-rel="tooltip" title="Modify which BaasBox API are accessible from the outside world"><a class="ajax-link" href="#permissions"><i class="icon-lock"></i><span class="hidden-tablet"> Api Access</span></a></li>
-							<li data-rel="tooltip" title="Manage the database: backup, restore, reset"><a class="ajax-link" href="#dbmanager"><i class="icon-hdd"></i><span class="hidden-tablet"> DB Management</span></a></li>
-							<li data-rel="tooltip" title="Push Notification Configuration"><a class="ajax-link" href="#push_conf"><i class="icon-wrench"></i><span class="hidden-tablet"> Push Settings</span></a></li>
-
+							<li data-rel="tooltip" title="Get/Set many configuration paramenters about BaasBox and your App"><a class="ajax-link" href="#settings"><i class="fa fa-gear fa-fw"></i><span class="hidden-tablet"> Settings</span></a></li>
+                            <li data-rel="tooltip" title="Modify which BaasBox API are accessible from the outside world"><a class="ajax-link" href="#permissions"><i class="fa fa-key fa-fw"></i><span class="hidden-tablet"> Api Access</span></a></li>
+							<li data-rel="tooltip" title="Manage the database: backup, restore, reset"><a class="ajax-link" href="#dbmanager"><i class="fa fa-database fa-fw"></i><span class="hidden-tablet"> DB Management</span></a></li>
+							<li data-rel="tooltip" title="Push Notification Configuration"><a class="ajax-link" href="#push_conf"><i class="fa fa-envelope fa-fw"></i><span class="hidden-tablet"> Push Settings</span></a></li>
+						<li class="nav-header hidden-tablet">Plugins</li>
+							<li data-rel="tooltip" title="Manage your server scripts"><a class="ajax-link" href="#scripts"><i class="fa fa-puzzle-piece fa-fw"></i><span class="hidden-tablet"> Installed Plugins</span></a></li>		
 						<li class="nav-header hidden-tablet">Users</li>
-							<li data-rel="tooltip" title="Roles management page"><a class="ajax-link" href="#roles"><i class=" icon-eye-open"></i><span class="hidden-tablet"> Roles</span></a></li>
-							<li data-rel="tooltip" title="Users management page"><a class="ajax-link" href="#users"><i class="icon-user"></i><span class="hidden-tablet"> Users</span></a></li>
+							<li data-rel="tooltip" title="Roles management page"><a class="ajax-link" href="#roles"><i class="fa fa-users fa-fw"></i><span class="hidden-tablet"> Roles</span></a></li>
+							<li data-rel="tooltip" title="Users management page"><a class="ajax-link" href="#users"><i class="fa fa-user fa-fw"></i><span class="hidden-tablet"> Users</span></a></li>
 						<li class="nav-header hidden-tablet">Data</li>
-							<li data-rel="tooltip" title="Manage the collections, a sort of bucket for data objects."><a class="ajax-link" href="#collections"><i class="icon-book"></i><span class="hidden-tablet"> Collections</span></a></li>
-							<li data-rel="tooltip" title="Documents are arbitrary objects stored in the collections"><a class="ajax-link" href="#documents"><i class="icon-file"></i><span class="hidden-tablet"> Documents</span></a></li>
+							<li data-rel="tooltip" title="Manage the collections, a sort of bucket for data objects."><a class="ajax-link" href="#collections"><i class="fa fa-files-o fa-fw"></i><span class="hidden-tablet"> Collections</span></a></li>
+							<li data-rel="tooltip" title="Documents are arbitrary objects stored in the collections"><a class="ajax-link" href="#documents"><i class="fa fa-file fa-fw"></i><span class="hidden-tablet"> Documents</span></a></li>
 						<li class="nav-header hidden-tablet">Storage</li>
-							<li data-rel="tooltip" title="Manage the Files stored on BaasBox"><a class="ajax-link" href="#files"><i class="icon icon-darkgray icon-save"></i><span class="hidden-tablet"> Files</span></a></li>
-							<li data-rel="tooltip" title="Manage the Assets, public data available without authentication"><a class="ajax-link" href="#assets"><i class="icon-picture"></i><span class="hidden-tablet"> Assets</span></a></li>
-						<li class="nav-header hidden-tablet">Server Side Code</li>
-							<li data-rel="tooltip" title="Manage your server scripts"><a class="ajax-link" href="#scripts"><i class="icon  icon-darkgray icon-archive "></i><span class="hidden-tablet"> Plugins</span></a></li>	
+							<li data-rel="tooltip" title="Manage the Files stored on BaasBox"><a class="ajax-link" href="#files"><i class="fa fa-save fa-fw"></i><span class="hidden-tablet"> Files</span></a></li>
+							<li data-rel="tooltip" title="Manage the Assets, public data available without authentication"><a class="ajax-link" href="#assets"><i class="fa fa-file-image-o fa-fw"></i><span class="hidden-tablet"> Assets</span></a></li>
 						<li class="nav-header hidden-tablet">Help</li>
-							<li data-rel="tooltip" title="Take a tour through the main console features"> <a  data-tour="general" class="tour"  ><span class="hidden-tablet"><i class="icon-globe"></i> General Tour</span></a></li>
-							<li > <a class="directLink" target="_new" href="http://www.baasbox.com/version/help/doc/@(version.toLowerCase().replaceAll("-snapshot",""))"><i class=" icon-book"></i> Online Doc</a></li>
-							<li data-rel="tooltip" title="Take a look to the tutorial section"> <a target="_blank" href="http://www.baasbox.com/tutorial/" id="tour" class="directLink"><span class="hidden-tablet"><i class="icon-comment"></i> Tutorial</span></a></li>
-							<li data-rel="tooltip" title="Go to our support site"> <a target="_blank" href="http://www.baasbox.com/version/help/support/" id="tour" class="directLink"><span class="hidden-tablet"><i class="icon-question-sign"></i> FAQ</span></a></li>
+							<li data-rel="tooltip" title="Take a tour through the main console features"> <a  data-tour="general" class="tour"  ><i class="fa fa-globe fa-fw"></i><span class="hidden-tablet">General Tour</span></a></li>
+							<li > <a class="directLink" target="_new" href="http://www.baasbox.com/version/help/doc/@(version.toLowerCase().replaceAll("-snapshot",""))"><i class="fa fa-book fa-fw"></i><span class="hidden-tablet">Online Doc</span></a></li>
+							<li data-rel="tooltip" title="Take a look to the tutorial section"> <a target="_blank" href="http://www.baasbox.com/tutorial/" id="tour" class="directLink"><i class="fa fa-terminal fa-fw"></i><span class="hidden-tablet">Tutorial</span></a></li>
+							<li data-rel="tooltip" title="Go to our support site"> <a target="_blank" href="http://www.baasbox.com/version/help/support/" id="tour" class="directLink"><i class="fa fa-comments fa-fw"></i><span class="hidden-tablet">Community</span></a></li>
 						<li class="nav-header hidden-tablet">Logout</li>
-							<li data-rel="tooltip" title="Exit the administration console"> <a class="ajax-link logout"><span class="hidden-tablet"><i class=" icon-off"></i> Logout</span></a></li>
+							<li data-rel="tooltip" title="Exit the administration console"> <a class="ajax-link logout"><i class="fa fa-power-off fa-fw"></i><span class="hidden-tablet">Logout</span></a></li>
 					</ul>
 					<label style="display:none" id="for-is-ajax" class="hidden-tablet" for="is-ajax"><input id="is-ajax" type="checkbox"> Ajax on menu</label>
 				</div><!--/.well -->

public/console/css/baasbox.css

@@ -460,4 +460,7 @@ li.plugin.deactivated{
       text-overflow: ellipsis;
       white-space: nowrap;  
       position: relative;
-   }
+   }
+.black{
+	color:black;
+}