【新项目】【看板项目】【ext图标上传及图标地址修改】

kanban-console/src/main/webapp/WEB-INF/views/desktop.html

@@ -25,53 +25,6 @@
 			Ext.create('erp.view.desktop.Viewport');
 		}
 	});
-	function kaishi() {
-		var docElm = document.documentElement;
-		//W3C 
-		if (docElm.requestFullscreen) {
-			console.log('===');
-			docElm.requestFullscreen();
-		}
-		//FireFox 
-		else if (docElm.mozRequestFullScreen) {
-			docElm.mozRequestFullScreen();
-		}
-		//Chrome等 
-		else if (docElm.webkitRequestFullScreen) {
-			console.log('------------');
-			docElm.webkitRequestFullScreen();
-		}
-		//IE11 
-		else if (elem.msRequestFullscreen) {
-			elem.msRequestFullscreen();
-		}
-	}
-	document.addEventListener("keydown", function(e) {
-		var currKey = 0;
-		var e = e || event;
-		var currKey = e.keyCode || e.which || e.charCode;
-		if (currKey == 13) {
-			kaishi();
-		}
-	}, false);
-	function test() {
-		Ext.MessageBox.show({
-			title : '全屏模式',
-			msg : '进入全屏模式!',
-			buttons : Ext.MessageBox.YESNO,
-			buttonText : {
-				yes : "是",
-				no : "否"
-			},
-			fn : function(btn) {
-				if (btn == 'yes') {
-					kaishi();
-				}
-			}
-		});
-	}
-	setTimeout("kaishi()", 1000);
-
 	var em_type = 'normal';
 </script>
 </head>

kanban-console/src/main/webapp/resources/app/view/desktop/Toolbar.js

@@ -12,7 +12,6 @@ Ext.define('erp.view.desktop.Toolbar', {
 	initComponent : function() {
 		var me = this;
 		var a=Ext.widget('startmenu');
-		console.log(a);
 		me.items=[{
             xtype: 'button',
             cls: 'ux-start-button',

kanban-console/src/main/webapp/resources/css/desktop.css

@@ -167,7 +167,7 @@ div.ux-taskbar div.x-toolbar {
     padding: 8px;
     margin: 8px;
     width: 64px;
-    float: left;
+    /* float: left; */
 }
 
 .ux-desktop-shortcut-icon {
@@ -188,10 +188,10 @@ div.ux-taskbar div.x-toolbar {
     text-decoration: underline;
 }
 
-.desktop-li{
-	display:block;
-	float:inherit
-}
+ .desktop-li{
+ 	display:inline-block;
+ 	float:left
+} 
 
 
 /*----------------------------------------------------
@@ -264,16 +264,16 @@ div.ux-taskbar div.x-toolbar {
     background-image:url( ../images/grid.png ) !important;
 }
 .add {
-    background-image:url(../../shared/icons/fam/add.gif) !important;
+    background-image:url(../images/icons/fam/add.gif) !important;
 }
 .option {
-    background-image:url(../../shared/icons/fam/plugin.gif) !important;
+    background-image:url(../images/icons/fam/plugin.gif) !important;
 }
 .remove {
-    background-image:url(../../shared/icons/fam/delete.gif) !important;
+    background-image:url(../images/icons/fam/delete.gif) !important;
 }
 .save {
-    background-image:url(../../shared/icons/save.gif) !important;
+    background-image:url(../images/icons/save.gif) !important;
 }
 .accordion {
     background-image:url(../images/accordian.gif) !important;
@@ -287,31 +287,31 @@ div.ux-taskbar div.x-toolbar {
 */
 
 .user {
-    background-image:url( ../../shared/icons/fam/user.gif ) !important;
+    background-image:url( ../images/icons/fam/user.gif ) !important;
 }
 
 .user-add {
-    background-image:url(../../shared/icons/fam/user_add.gif) !important;
+    background-image:url(../images/icons/fam/user_add.gif) !important;
 }
 
 .user-delete {
-    background-image:url(../../shared/icons/fam/user_delete.gif) !important;
+    background-image:url(../images/icons/fam/user_delete.gif) !important;
 }
 
 .connect {
-    background-image:url(../../shared/icons/fam/connect.gif) !important;
+    background-image:url(../images/icons/fam/connect.gif) !important;
 }
 
 .user-girl {
-    background-image:url(../../shared/icons/fam/user_female.gif) !important;
+    background-image:url(../images/icons/fam/user_female.gif) !important;
 }
 
 .user-kid {
-    background-image:url(../../shared/icons/fam/user_green.gif) !important;
+    background-image:url(../images/icons/fam/user_green.gif) !important;
 }
 
 .user-suit {
-    background-image:url(../../shared/icons/fam/user_suit.gif) !important;
+    background-image:url(../images/icons/fam/user_suit.gif) !important;
 }
 
 /*----------------------------------------------------

kanban-console/src/main/webapp/resources/images/desktop.css

@@ -255,16 +255,16 @@ div.ux-taskbar div.x-toolbar {
     background-image:url( ../images/grid.png ) !important;
 }
 .add {
-    background-image:url(../../shared/icons/fam/add.gif) !important;
+    background-image:url(../images/icons/fam/add.gif) !important;
 }
 .option {
-    background-image:url(../../shared/icons/fam/plugin.gif) !important;
+    background-image:url(../images/icons/fam/plugin.gif) !important;
 }
 .remove {
-    background-image:url(../../shared/icons/fam/delete.gif) !important;
+    background-image:url(../images/icons/fam/delete.gif) !important;
 }
 .save {
-    background-image:url(../../shared/icons/save.gif) !important;
+    background-image:url(../images/icons/save.gif) !important;
 }
 .accordion {
     background-image:url(../images/accordian.gif) !important;
@@ -278,29 +278,29 @@ div.ux-taskbar div.x-toolbar {
 */
 
 .user {
-    background-image:url( ../../shared/icons/fam/user.gif ) !important;
+    background-image:url( ../images/icons/fam/user.gif ) !important;
 }
 
 .user-add {
-    background-image:url(../../shared/icons/fam/user_add.gif) !important;
+    background-image:url(../images/icons/fam/user_add.gif) !important;
 }
 
 .user-delete {
-    background-image:url(../../shared/icons/fam/user_delete.gif) !important;
+    background-image:url(../images/icons/fam/user_delete.gif) !important;
 }
 
 .connect {
-    background-image:url(../../shared/icons/fam/connect.gif) !important;
+    background-image:url(../images/icons/fam/connect.gif) !important;
 }
 
 .user-girl {
-    background-image:url(../../shared/icons/fam/user_female.gif) !important;
+    background-image:url(../images/icons/fam/user_female.gif) !important;
 }
 
 .user-kid {
-    background-image:url(../../shared/icons/fam/user_green.gif) !important;
+    background-image:url(../images/icons/fam/user_green.gif) !important;
 }
 
 .user-suit {
-    background-image:url(../../shared/icons/fam/user_suit.gif) !important;
+    background-image:url(../images/icons/fam/user_suit.gif) !important;
 }

kanban-console/src/main/webapp/resources/images/icons/fam/SILK.txt

@@ -0,0 +1,3 @@
+The icons in this folder are direct gif conversions of the fam fam fam silk icons.
+
+Please see http://www.famfamfam.com/lab/icons/silk/ for more details.