with notifications and other changes
This commit is contained in:
		
							parent
							
								
									6158799a47
								
							
						
					
					
						commit
						ddf6a606a2
					
				
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 1.1 KiB  | 
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 2.4 KiB  | 
| 
						 | 
					@ -1,4 +1,5 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
orbitDesktop.prototype.themefolder = "desktop_themes";
 | 
					orbitDesktop.prototype.themefolder = "desktop_themes";
 | 
				
			||||||
 | 
					orbitDesktopAPI.prototype.notifyImgPath = "/assets/";
 | 
				
			||||||
var od = new orbitDesktop("#ajax_container");
 | 
					var od = new orbitDesktop("#ajax_container");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -18,7 +18,6 @@ var orbitDesktop = function(dom){
 | 
				
			||||||
			o.themesettings = eval(ts);
 | 
								o.themesettings = eval(ts);
 | 
				
			||||||
			$('head').append( $('<link rel="stylesheet" id="dyn_css" type="text/css" />').attr('href', "/"+o.themefolder+"/"+theme+"/css/"+ts.css));
 | 
								$('head').append( $('<link rel="stylesheet" id="dyn_css" type="text/css" />').attr('href', "/"+o.themefolder+"/"+theme+"/css/"+ts.css));
 | 
				
			||||||
			$(document).ready(function(){o.loadWallpaper();o.bindDesktopEvents();o.loadIconCache();o.initializeDesktop();});
 | 
								$(document).ready(function(){o.loadWallpaper();o.bindDesktopEvents();o.loadIconCache();o.initializeDesktop();});
 | 
				
			||||||
			return;
 | 
					 | 
				
			||||||
		})
 | 
							})
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	};
 | 
						};
 | 
				
			||||||
| 
						 | 
					@ -134,7 +133,7 @@ var orbitDesktop = function(dom){
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	};
 | 
						};
 | 
				
			||||||
	this.tempFunc = function(){
 | 
						this.tempFunc = function(){
 | 
				
			||||||
		alert(o.tp);
 | 
							o.notify("This is test notification!!","imp")
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	this.initializeAppSearch = function(target){
 | 
						this.initializeAppSearch = function(target){
 | 
				
			||||||
		o.currenthtml = target;
 | 
							o.currenthtml = target;
 | 
				
			||||||
| 
						 | 
					@ -204,8 +203,9 @@ var orbitDesktop = function(dom){
 | 
				
			||||||
			});
 | 
								});
 | 
				
			||||||
			$(".section_label ul li:not(:nth-child(1))").droppable({
 | 
								$(".section_label ul li:not(:nth-child(1))").droppable({
 | 
				
			||||||
				drop:function(){
 | 
									drop:function(){
 | 
				
			||||||
					if($("#"+$(this).attr("data-category")+" .element").length>=24)
 | 
										if($("#"+$(this).attr("data-category")+" .element").length>=24){
 | 
				
			||||||
						o.notify("Section is full");
 | 
											o.notify("Section is full.","alert");
 | 
				
			||||||
 | 
										}
 | 
				
			||||||
					else
 | 
										else
 | 
				
			||||||
						$("#"+$(this).attr("data-category")).append(element);
 | 
											$("#"+$(this).attr("data-category")).append(element);
 | 
				
			||||||
				}	
 | 
									}	
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,8 +15,29 @@ var sortDescending = function(a, b) {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
var orbitDesktopAPI = function(){
 | 
					var orbitDesktopAPI = function(){
 | 
				
			||||||
	o = this;
 | 
						o = this;
 | 
				
			||||||
	this.notify = function(msg){
 | 
						this.notify = function(msg,type,time){
 | 
				
			||||||
		alert(msg);
 | 
							var $notify = $("#orbitnote");
 | 
				
			||||||
 | 
							var img;
 | 
				
			||||||
 | 
							if(!type)type="";
 | 
				
			||||||
 | 
							switch(type){
 | 
				
			||||||
 | 
								case "alert":
 | 
				
			||||||
 | 
								img = "note_alert.png";
 | 
				
			||||||
 | 
								break;
 | 
				
			||||||
 | 
								case "imp":
 | 
				
			||||||
 | 
								img = "note_imp.png";
 | 
				
			||||||
 | 
								break;
 | 
				
			||||||
 | 
								case "success":
 | 
				
			||||||
 | 
								img = "note_success.png";
 | 
				
			||||||
 | 
								break;
 | 
				
			||||||
 | 
								default:
 | 
				
			||||||
 | 
								img = "note_alert.png";
 | 
				
			||||||
 | 
								break;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							$notify.find("img#note_img").attr("src","/assets/"+img);
 | 
				
			||||||
 | 
							$notify.find(".note_message").text(msg);
 | 
				
			||||||
 | 
							if(!time)time=5000; else time=time*1000;
 | 
				
			||||||
 | 
							$notify.slideDown().delay(time).slideUp();
 | 
				
			||||||
 | 
						};
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					orbitDesktopAPI.prototype.notifyImgPath = "";
 | 
				
			||||||
| 
						 | 
					@ -175,6 +175,33 @@ a { text-decoration: none; }
 | 
				
			||||||
.clear { clear: both; }
 | 
					.clear { clear: both; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Orbit Notification */
 | 
				
			||||||
 | 
					#orbitnote {
 | 
				
			||||||
 | 
						position: absolute;
 | 
				
			||||||
 | 
						top: 0;
 | 
				
			||||||
 | 
						left: 50%;
 | 
				
			||||||
 | 
						margin-left: -206px;
 | 
				
			||||||
 | 
						z-index: 99999;
 | 
				
			||||||
 | 
						width: 400px;
 | 
				
			||||||
 | 
						padding: 0 6px 6px 6px;
 | 
				
			||||||
 | 
						background-color: #000;
 | 
				
			||||||
 | 
						background-color: rgba(0,0,0,0.6);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					.note_holder {
 | 
				
			||||||
 | 
						background-color: #f3f3f3;
 | 
				
			||||||
 | 
						border: solid 1px #fff;
 | 
				
			||||||
 | 
						border-top: none;
 | 
				
			||||||
 | 
						overflow: hidden;
 | 
				
			||||||
 | 
						padding: 24px 24px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					.note_type {	float: left; }
 | 
				
			||||||
 | 
					.note_type img { display: block; }
 | 
				
			||||||
 | 
					.note_message {
 | 
				
			||||||
 | 
						color: #333;
 | 
				
			||||||
 | 
						margin: 10px 0 0 48px;
 | 
				
			||||||
 | 
						font-size: 15px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* fake Orbit bar */
 | 
					/* fake Orbit bar */
 | 
				
			||||||
#orbitbar {
 | 
					#orbitbar {
 | 
				
			||||||
	height: 28px;
 | 
						height: 28px;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,4 +8,12 @@ class DesktopController< ApplicationController
 | 
				
			||||||
  def desktop
 | 
					  def desktop
 | 
				
			||||||
    render :layout => false
 | 
					    render :layout => false
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  def app_manager
 | 
				
			||||||
 | 
					     render :layout => false
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  def sections
 | 
				
			||||||
 | 
					    render :layout => false
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					@ -1,8 +1,8 @@
 | 
				
			||||||
<div id="side">
 | 
					<div id="side">
 | 
				
			||||||
	<div id="rwidget" class="wh3 thmc4">
 | 
						<div id="rwidget" class="wh3 thmc4">
 | 
				
			||||||
		<a href="desktop" class="widget_fn wh3 hh3" id='desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="home_icon" width="30" height="30"/></span></a>
 | 
							<a href="desktop" class="widget_fn wh3 hh3" id='desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="home_icon" width="30" height="30"/></span></a>
 | 
				
			||||||
		<a href="app_manager.html" class="widget_fn wh3 hh3" id="app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="app_manager_icon" width="30" height="30"/></span></a>
 | 
							<a href="app_manager" class="widget_fn wh3 hh3" id="app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="app_manager_icon" width="30" height="30"/></span></a>
 | 
				
			||||||
		<a href="sections.html" class="widget_fn wh3 hh3" id="sections" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="sections_icon" width="30" height="30"/></span></a>
 | 
							<a href="sections" class="widget_fn wh3 hh3" id="sections" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="sections_icon" width="30" height="30"/></span></a>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
<div id="container">
 | 
					<div id="container">
 | 
				
			||||||
| 
						 | 
					@ -21,4 +21,10 @@ Change Theme: <select id="change_theme">
 | 
				
			||||||
</select>
 | 
					</select>
 | 
				
			||||||
<img src="" id="thmbackground" />
 | 
					<img src="" id="thmbackground" />
 | 
				
			||||||
<div id="bgover" ></div>
 | 
					<div id="bgover" ></div>
 | 
				
			||||||
 | 
					<div id="orbitnote" style="display:none;">
 | 
				
			||||||
 | 
						<div class="note_holder">
 | 
				
			||||||
 | 
							<div class="note_type"><img id='note_img' alt=""/></div>
 | 
				
			||||||
 | 
							<div class="note_message">Check the Notifications section for more information.</div>
 | 
				
			||||||
 | 
						</div>
 | 
				
			||||||
 | 
					</div>
 | 
				
			||||||
<button onClick="od.tempFunc();">Click</button>
 | 
					<button onClick="od.tempFunc();">Click</button>
 | 
				
			||||||
| 
						 | 
					@ -103,6 +103,8 @@ Orbit::Application.routes.draw do
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
  match '/desktop/'=>'desktop#index'
 | 
					  match '/desktop/'=>'desktop#index'
 | 
				
			||||||
  match '/desktop/desktop'=>'desktop#desktop'
 | 
					  match '/desktop/desktop'=>'desktop#desktop'
 | 
				
			||||||
 | 
					  match '/desktop/app_manager'=>'desktop#app_manager'
 | 
				
			||||||
 | 
					  match '/desktop/sections'=>'desktop#sections'
 | 
				
			||||||
  match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|
 | 
					  match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|
 | 
				
			||||||
    !request.query_string.include?("inner=true")
 | 
					    !request.query_string.include?("inner=true")
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue