diff --git a/FacewhatML5/.classpath b/FacewhatML5/.classpath deleted file mode 100644 index b4a86a5..0000000 --- a/FacewhatML5/.classpath +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FacewhatML5/.idea/.name b/FacewhatML5/.idea/.name new file mode 100644 index 0000000..97d3f3d --- /dev/null +++ b/FacewhatML5/.idea/.name @@ -0,0 +1 @@ +FacewhatML5 \ No newline at end of file diff --git a/FacewhatML5/.idea/FacewhatML5.iml b/FacewhatML5/.idea/FacewhatML5.iml new file mode 100644 index 0000000..38893c4 --- /dev/null +++ b/FacewhatML5/.idea/FacewhatML5.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/FacewhatML5/.idea/encodings.xml b/FacewhatML5/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/FacewhatML5/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/FacewhatML5/.idea/jsLibraryMappings.xml b/FacewhatML5/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..5a1f70b --- /dev/null +++ b/FacewhatML5/.idea/jsLibraryMappings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/FacewhatML5/.idea/libraries/FacewhatML5_node_modules.xml b/FacewhatML5/.idea/libraries/FacewhatML5_node_modules.xml new file mode 100644 index 0000000..526df6d --- /dev/null +++ b/FacewhatML5/.idea/libraries/FacewhatML5_node_modules.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/FacewhatML5/.idea/misc.xml b/FacewhatML5/.idea/misc.xml new file mode 100644 index 0000000..72abef0 --- /dev/null +++ b/FacewhatML5/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/FacewhatML5/.idea/modules.xml b/FacewhatML5/.idea/modules.xml new file mode 100644 index 0000000..aaeb3ab --- /dev/null +++ b/FacewhatML5/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/FacewhatML5/.idea/workspace.xml b/FacewhatML5/.idea/workspace.xml new file mode 100644 index 0000000..402bf63 --- /dev/null +++ b/FacewhatML5/.idea/workspace.xml @@ -0,0 +1,1517 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + $PROJECT_DIR$/gulpfile.js + + + clean + + + copy + + + + + + + default + + + less + + + lint + + + loadfiles + + + minCss + + + scripts + + + startServer + + + stopServer + + + watchCss + + + watchJs + + + watchLess + + + watcher + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $PROJECT_DIR$ + true + + bdd + + DIRECTORY + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + 1502956417245 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + file://$PROJECT_DIR$/gulpfile.js + 25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FacewhatML5/.project b/FacewhatML5/.project deleted file mode 100644 index 082a0ab..0000000 --- a/FacewhatML5/.project +++ /dev/null @@ -1,46 +0,0 @@ - - - xowim - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - com.genuitec.eclipse.j2eedt.core.DeploymentDescriptorValidator - - - - - com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/FacewhatML5/.settings/.jsdtscope b/FacewhatML5/.settings/.jsdtscope deleted file mode 100644 index 2fc9dba..0000000 --- a/FacewhatML5/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/FacewhatML5/.settings/org.eclipse.jdt.core.prefs b/FacewhatML5/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b63..0000000 --- a/FacewhatML5/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/FacewhatML5/.settings/org.eclipse.wst.common.component b/FacewhatML5/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 62ec9df..0000000 --- a/FacewhatML5/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/FacewhatML5/.settings/org.eclipse.wst.common.project.facet.core.xml b/FacewhatML5/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 1975da9..0000000 --- a/FacewhatML5/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/FacewhatML5/.settings/org.eclipse.wst.jsdt.ui.superType.container b/FacewhatML5/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/FacewhatML5/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/FacewhatML5/.settings/org.eclipse.wst.jsdt.ui.superType.name b/FacewhatML5/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/FacewhatML5/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/FacewhatML5/WebRoot/META-INF/MANIFEST.MF b/FacewhatML5/WebRoot/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e..0000000 --- a/FacewhatML5/WebRoot/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/FacewhatML5/WebRoot/WEB-INF/web.xml b/FacewhatML5/WebRoot/WEB-INF/web.xml deleted file mode 100644 index 94fd0bd..0000000 --- a/FacewhatML5/WebRoot/WEB-INF/web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - xowim - - index.html - index.htm - index.jsp - default.html - default.htm - default.jsp - - \ No newline at end of file diff --git a/FacewhatML5/WebRoot/login.html b/FacewhatML5/WebRoot/login.html deleted file mode 100644 index 44ae331..0000000 --- a/FacewhatML5/WebRoot/login.html +++ /dev/null @@ -1,202 +0,0 @@ - - - - 登录页面 - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
-

- - -

-

- - -

-

- - -

-
-

- - - 登录状态 - - - - - 登录 - - -

-
-
-
- - - - diff --git a/FacewhatML5/WebRoot/scripts/xow/xowim2.js b/FacewhatML5/WebRoot/scripts/xow/xowim2.js deleted file mode 100644 index 067a439..0000000 --- a/FacewhatML5/WebRoot/scripts/xow/xowim2.js +++ /dev/null @@ -1,401 +0,0 @@ - -(function(factory){ - // 暂时不用amd那个东西，因为还不知道那个的具体用处 - window.XoW = factory(Strophe); -}(function(Strophe){ - -var XoW; - -XoW = { - VERSION : "1.0", - // 命名空间 - NS : { - PING : "urn:xmpp:ping", - VCARD : "vcard-temp", - USER_SERACH : "jabber:iq:search", - FORM_DATA : "jabber:x:data", - ARCHIVE : "urn:xmpp:archive", - FW_ORGNIZATION : 'http://facewhat.com/orgnization', - }, - // 节类型 - StanzaType : { - SET : "set", - GET : "get", - RESULT : "result", - ERROR : "error" - }, -}; - - -return XoW; -})); - - - - - -(function(factory) { - return factory(XoW); -}(function(XoW) { - -/** - * - * @param options 参数 - * loginStateAId - * 用来显示登录状态的A标签的id。 - */ -XoW.GlobalManager = function() { - - this._connMgr = null; - this._viewMgr = null; - this._rosterMgr = null; - this._userMgr = null; - this._vcardMgr = null; - this._presenceMgr = null; - this._chatMgr = null; - this._roomMgr = null; - this._messageArchiveMgr = null; - this._orgnizationMgr = null; - this._serverMgr = null; // 服务器管理对象 - this._currentUser = null; // 当前登录用户 - this._currentUserJid = ''; // 当前用户jid - this._currentUserPwd = ""; // 当前登录用户密码 - - // 用于打日志的时候显示是该类内部的方法调用的打日志。 - this.classInfo="【GlobalManager】"; - - this._init(); -}; - -XoW.GlobalManager.prototype = { - /** - * 初始化方法，做一些初始化 - */ - _init : function() { - XoW.logger.ms(this.classInfo + "_init()"); - - // 新建连接管理对象 - this._connMgr = new XoW.ConnectionManager(this); - - // 将登录结果的回调函数放入其中 - this._connMgr.addHandlerToConnMgr('loginCb', this._connectCb.bind(this)); - - - // 新建界面管理对象 - this._viewMgr = new XoW.ViewManager(this); - - - XoW.logger.me(this.classInfo + "_init()"); - }, - - /** - * 得到各种管理对象。这种方式就和OPenfire提供了很多单例类类似。。 - * 这种方式和老师说的以命令的方式，谁比较好？ - * 感觉使用命令方式，调用者会不会很困惑？ - * 命令模式开放的接口是： - * get(params) ? - * 还是比如获取各种Manager的时候就是 - * getManager(params) ? - * - */ - /** - * 现在的控制权在strophe中 。如果我想要控制所有节的走向 - * 那么。就不能使用strophe的扩展插件了。 - */ - getConnMgr : function() { - XoW.logger.d(this.classInfo + "获取了_connMgr 对象"); - return this._connMgr; - }, - getUserMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _userMgr 对象"); - return this._userMgr; - }, - getRosterMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _rosterMgr 对象"); - return this._rosterMgr; - }, - getViewMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _viewMgr 对象"); - return this._viewMgr; - }, - getVcardMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _vcardMgr 对象"); - return this._vcardMgr; - }, - getPresenceMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _presenceMgr 对象"); - return this._presenceMgr; - }, - getChatMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _chatMgr 对象"); - return this._chatMgr; - }, - getRoomMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _roomMgr 对象"); - return this._roomMgr; - }, - getServerMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _serverMgr 对象"); - return this._serverMgr; - }, - getCurrentUser : function() { - XoW.logger.d(this.classInfo + "获取了 _currentUser 对象"); - return this._currentUser; - }, - // 返回当前服务器名称，这个方法有点不妥。 -// getCurrentServer : function() { -// XoW.logger.d(this.classInfo + "getCurrentServer"); -// return XoW.utils.getDomainFromJid(this._currentUser.getJid()); -// }, - getMessageArchiveMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _messageArchiveMgr 对象"); - return this._messageArchiveMgr; - }, - - getOrgnizationMgr : function() { - XoW.logger.d(this.classInfo + "获取了 _orgnizationMgr 对象"); - return this._orgnizationMgr; - }, - - /** - * 新建XoW.Connection对象并开始连接 - * @param serviceURL 服务器URL - * @param username 用户名，不包含后面的ip等 - * @param pass 密码 - */ - connect : function(serviceURL, username, pass) { - XoW.logger.ms(this.classInfo + "connect()"); - XoW.logger.p({"serviceURL" : serviceURL, "username" : username, "pass" : pass}); - - // 得到jid - this._currentUserJid = username + "@" + XoW.utils.getIPFromURL(serviceURL); - // this._currentUser.setJid(jid); - this._currentUserPwd = pass; - - - // 开始连接 _currentUserJid - this._connMgr.connect(serviceURL, this._currentUserJid, this._currentUserPwd); - this._connMgr.addHandler(function(stanza) { - XoW.logger.d("open-->" + Strophe.serialize(stanza)); - }, null, 'open'); - - - - - XoW.logger.me(this.classInfo + "connect()"); - }, - /** - * 登录结果回调 - * @param params 包含 - * success{boolean} 登录成功返回true，其他返回false - * msg 登录结果消息 - * cond 登录结果代码，参考Strophe的登录结果代码 - */ - _connectCb : function (params) { - var success = params.success; - var msg = params.msg; - var cond = params.cond; - - XoW.logger.ms(this.classInfo + "_connectCb()"); - XoW.logger.p({"success" : success, "msg" : msg, cond : cond}); - - if(success) { // 登录成功 - XoW.logger.i(this.classInfo + "登录成功"); - - // 初始化一些登录之后才要/才能初始化的管理器 - this._initManager(); - // 做一些动作 - this._actions(); - - - } else { - XoW.logger.i(this.classInfo + "登录失败"); - } - - XoW.logger.me(this.classInfo + "_connectCb()"); - return true; - }, - - /** - * 登录成功后才初始化的一些Manager - */ - _initManager : function() { - XoW.logger.ms(this.classInfo + "_initManager()"); - - // 新建聊天管理对象 - this._chatMgr = new XoW.ChatManager(this); - - // 新建好友管理对象 - this._userMgr = new XoW.UserManager(this); - - // 新建房间管理对象 - this._roomMgr = new XoW.RoomManager(this); - - // 历史消息管理对象 - this._messageArchiveMgr = new XoW.MessageArchiveManager(this); - - // 组织结构树管理对象 - this._orgnizationMgr = new XoW.OrgnizationManager(this); - - // 在初始化userMgr之后就要调用这个，这个应该是界面来监听的。。 - this._viewMgr._afterInitUserMgr(); - - // 当前登录用户 - this._currentUser = new XoW.User(this._userMgr); - //this._currentUser.setJid(); - // 设置状态为在线。1是在线，因为刚开始登录的时候，有收不到自己出席的节的时候。 - this._currentUser.setState(1); - - - // this._currentUser.setUserMgr(this._userMgr); - - // 初始化会议室聊天管理 - // this._roomMgr = new XoW.RoomManager(this); - - // 当前用户的出席节监听 - //this._presenceMgr.addPresenceHandler(this._presence_cb.bind(this)); - - // 新建花名册管理对象 - //this._rosterMgr = new XoW.RosterManager(this); - - - XoW.logger.me(this.classInfo + "_initManager()"); - }, - /** - * 各种动作，请求好友列表，发送出席节等 - */ - _actions : function() { - XoW.logger.ms(this.classInfo + "_actions()"); - - // var userJid = this.getCurrentUser().getJid(); - // var ip = XoW.utils.getIPFromURL(userJid); - - - // 此时才开始请求好友列表 - this._currentUser.getRosterFromServer(function(params1) { - XoW.logger.d(this.classInfo + "请求roster完成"); - // 此时开始请求用户的个人vcard - this._currentUser.getVcardFromServer(function(params2) { - XoW.logger.d(this.classInfo + "请求vcard完成"); -// var params = { -// vcard : vcardTemp , -// vcardStanza : stanza, -// }; - // 因为刚开始未初始化 currentUser中的数据，所以jid,res - // 这些东西都为空。所以无法在presence中做（presence要比对from==jid）， - // 还有另外一个原因就是感觉有时候没能够收到自己的presence - // 而且请求vcard也在发送presence之前。 - var $vStanza = $(params2.vcardStanza); - var jid = $vStanza.attr('to'); - var pureJid = XoW.utils.getBareJidFromJid(jid); - var res = XoW.utils.getResourceFromJid(jid); - // 设置用户的纯jid - this._currentUser.setJid(pureJid); - this._currentUser.setResource(res); - - // 在内部已经有setVcard和setFace的操作了 - // this._currentUser.setVcard(params.vcard); - // this._currentUser.setFace(params.vcard.PHOTO.BINVAL); - - - // 在这里获得服务器的一些信息。 - // 先用jid的node来做name，后面可能用到vcard里面的name - // this._currentUser.setName(XoW.utils.getNodeFromJid(this._currentUser.getJid())); - // 在这里一定可以保证 当前用户已经是 node@domain/resource而不是 node@ip ？ - - // 新建服务管理的对象 - // 请求服务这个用到了 用户的域（node@domain/res)所以，要在 - // 上面该用户设置完pureJid后才能初始化。因为这个服务对象一初始化 - // 就会请求服务器。 - this._serverMgr = new XoW.ServerMananger(this); - // 此处请求所有的会议室，会议室管理对象是依赖服务管理对象 - // 因为只有存在 会议服务之后，才存在会议室管理服务。 - - - // 第一个出席节的发送至关重要，因为它告诉服务器“我”上线了，然后服务器会把： - // 所以一定要在这之前把一些该做的事做完，比如加载好友列表，加好一些监听器。 - // 1,好友的出席情况发给我， - // 2,离线消息发给我 - // 3,还有其他的一些 东西，比如 有人加我为好友。 - setTimeout(function() { - - XoW.logger.d(this.classInfo + "发送出席节"); - // 发送出席 - this._currentUser.sendOnline(); - // 请求房间列表 - // this._roomMgr.getAllRoomsFromServer(); - - /*this._viewMgr._showOrganization();*/ - this._orgnizationMgr._start(); // 启动。 - this._roomMgr._start(); // 启动 - }.bind(this), 1000); - - }.bind(this), function(errorStanza) { - alert("获取用户vcard失败！"); - }); - }.bind(this), function(errorStanza) { - alert("获取好友列表失败！"); - }); - - - }, - - -}; -return XoW; -})); - - - - -$(document).ready(function(){ - -// document.body.onkeyup = showCaretPos; -// document.body.onmouseup = showCaretPos; - XoW.logger.d("11111aaaaa"); - alert(XoW.utils.getCurrentDatetime()); - gblMgr = new XoW.GlobalManager(); - $('#login').bind('click', function() { - var serviceURL = $('#service').val(); - var username = $('#username').val(); - var pass = $('#password').val(); - if(null == serviceURL || "" == serviceURL) { - alert("请输入服务器名！"); - return false; - } - if(null == username || "" == username) { - alert("请输入用户名！"); - return false; - } - if(null == pass || "" == pass) { - alert("请输入密码！"); - return false; - } - - gblMgr.connect(serviceURL, username, pass); - }); - $('#login2').bind('click', function() { - var serviceURL = $('#service').val(); - var username = $('#username').val(); - var pass = $('#password').val(); - if(null == serviceURL || "" == serviceURL) { - alert("请输入服务器名！"); - return false; - } - if(null == username || "" == username) { - alert("请输入用户名！"); - return false; - } - if(null == pass || "" == pass) { - alert("请输入密码！"); - return false; - } - - gblMgr.connect(serviceURL, username, pass); - }); -}); - - - - - diff --git a/FacewhatML5/WebRoot/audio/2445.mp3 b/FacewhatML5/app/audio/2445.mp3 similarity index 100% rename from FacewhatML5/WebRoot/audio/2445.mp3 rename to FacewhatML5/app/audio/2445.mp3 diff --git a/FacewhatML5/WebRoot/audio/2445.wav b/FacewhatML5/app/audio/2445.wav similarity index 100% rename from FacewhatML5/WebRoot/audio/2445.wav rename to FacewhatML5/app/audio/2445.wav diff --git a/FacewhatML5/WebRoot/audio/5733.mp3 b/FacewhatML5/app/audio/5733.mp3 similarity index 100% rename from FacewhatML5/WebRoot/audio/5733.mp3 rename to FacewhatML5/app/audio/5733.mp3 diff --git a/FacewhatML5/WebRoot/audio/cbg.mp3 b/FacewhatML5/app/audio/cbg.mp3 similarity index 100% rename from FacewhatML5/WebRoot/audio/cbg.mp3 rename to FacewhatML5/app/audio/cbg.mp3 diff --git a/FacewhatML5/WebRoot/css/layim.css b/FacewhatML5/app/css/layim.css similarity index 100% rename from FacewhatML5/WebRoot/css/layim.css rename to FacewhatML5/app/css/layim.css diff --git a/FacewhatML5/WebRoot/css/layui.css b/FacewhatML5/app/css/layui.css similarity index 100% rename from FacewhatML5/WebRoot/css/layui.css rename to FacewhatML5/app/css/layui.css diff --git a/FacewhatML5/WebRoot/css/smohan.face.css b/FacewhatML5/app/css/smohan.face.css similarity index 100% rename from FacewhatML5/WebRoot/css/smohan.face.css rename to FacewhatML5/app/css/smohan.face.css diff --git a/FacewhatML5/WebRoot/images/1.png b/FacewhatML5/app/images/1.png similarity index 100% rename from FacewhatML5/WebRoot/images/1.png rename to FacewhatML5/app/images/1.png diff --git a/FacewhatML5/WebRoot/images/2.jpg b/FacewhatML5/app/images/2.jpg similarity index 100% rename from FacewhatML5/WebRoot/images/2.jpg rename to FacewhatML5/app/images/2.jpg diff --git a/FacewhatML5/WebRoot/images/3.jpg b/FacewhatML5/app/images/3.jpg similarity index 100% rename from FacewhatML5/WebRoot/images/3.jpg rename to FacewhatML5/app/images/3.jpg diff --git a/FacewhatML5/WebRoot/images/4.bmp b/FacewhatML5/app/images/4.bmp similarity index 100% rename from FacewhatML5/WebRoot/images/4.bmp rename to FacewhatML5/app/images/4.bmp diff --git a/FacewhatML5/WebRoot/images/archivemessage/end-date.png b/FacewhatML5/app/images/archivemessage/end-date.png similarity index 100% rename from FacewhatML5/WebRoot/images/archivemessage/end-date.png rename to FacewhatML5/app/images/archivemessage/end-date.png diff --git a/FacewhatML5/WebRoot/images/archivemessage/start-date.png b/FacewhatML5/app/images/archivemessage/start-date.png similarity index 100% rename from FacewhatML5/WebRoot/images/archivemessage/start-date.png rename to FacewhatML5/app/images/archivemessage/start-date.png diff --git a/FacewhatML5/WebRoot/images/back.jpg b/FacewhatML5/app/images/back.jpg similarity index 100% rename from FacewhatML5/WebRoot/images/back.jpg rename to FacewhatML5/app/images/back.jpg diff --git a/FacewhatML5/WebRoot/images/face/0/emo_01.gif b/FacewhatML5/app/images/face/0/emo_01.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_01.gif rename to FacewhatML5/app/images/face/0/emo_01.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_02.gif b/FacewhatML5/app/images/face/0/emo_02.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_02.gif rename to FacewhatML5/app/images/face/0/emo_02.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_03.gif b/FacewhatML5/app/images/face/0/emo_03.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_03.gif rename to FacewhatML5/app/images/face/0/emo_03.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_04.gif b/FacewhatML5/app/images/face/0/emo_04.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_04.gif rename to FacewhatML5/app/images/face/0/emo_04.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_05.gif b/FacewhatML5/app/images/face/0/emo_05.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_05.gif rename to FacewhatML5/app/images/face/0/emo_05.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_06.gif b/FacewhatML5/app/images/face/0/emo_06.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_06.gif rename to FacewhatML5/app/images/face/0/emo_06.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_07.gif b/FacewhatML5/app/images/face/0/emo_07.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_07.gif rename to FacewhatML5/app/images/face/0/emo_07.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_08.gif b/FacewhatML5/app/images/face/0/emo_08.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_08.gif rename to FacewhatML5/app/images/face/0/emo_08.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_09.gif b/FacewhatML5/app/images/face/0/emo_09.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_09.gif rename to FacewhatML5/app/images/face/0/emo_09.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_10.gif b/FacewhatML5/app/images/face/0/emo_10.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_10.gif rename to FacewhatML5/app/images/face/0/emo_10.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_11.gif b/FacewhatML5/app/images/face/0/emo_11.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_11.gif rename to FacewhatML5/app/images/face/0/emo_11.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_12.gif b/FacewhatML5/app/images/face/0/emo_12.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_12.gif rename to FacewhatML5/app/images/face/0/emo_12.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_13.gif b/FacewhatML5/app/images/face/0/emo_13.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_13.gif rename to FacewhatML5/app/images/face/0/emo_13.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_14.gif b/FacewhatML5/app/images/face/0/emo_14.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_14.gif rename to FacewhatML5/app/images/face/0/emo_14.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_15.gif b/FacewhatML5/app/images/face/0/emo_15.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_15.gif rename to FacewhatML5/app/images/face/0/emo_15.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_16.gif b/FacewhatML5/app/images/face/0/emo_16.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_16.gif rename to FacewhatML5/app/images/face/0/emo_16.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_17.gif b/FacewhatML5/app/images/face/0/emo_17.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_17.gif rename to FacewhatML5/app/images/face/0/emo_17.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_18.gif b/FacewhatML5/app/images/face/0/emo_18.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_18.gif rename to FacewhatML5/app/images/face/0/emo_18.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_19.gif b/FacewhatML5/app/images/face/0/emo_19.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_19.gif rename to FacewhatML5/app/images/face/0/emo_19.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_20.gif b/FacewhatML5/app/images/face/0/emo_20.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_20.gif rename to FacewhatML5/app/images/face/0/emo_20.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_21.gif b/FacewhatML5/app/images/face/0/emo_21.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_21.gif rename to FacewhatML5/app/images/face/0/emo_21.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_22.gif b/FacewhatML5/app/images/face/0/emo_22.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_22.gif rename to FacewhatML5/app/images/face/0/emo_22.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_23.gif b/FacewhatML5/app/images/face/0/emo_23.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_23.gif rename to FacewhatML5/app/images/face/0/emo_23.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_24.gif b/FacewhatML5/app/images/face/0/emo_24.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_24.gif rename to FacewhatML5/app/images/face/0/emo_24.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_25.gif b/FacewhatML5/app/images/face/0/emo_25.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_25.gif rename to FacewhatML5/app/images/face/0/emo_25.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_26.gif b/FacewhatML5/app/images/face/0/emo_26.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_26.gif rename to FacewhatML5/app/images/face/0/emo_26.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_27.gif b/FacewhatML5/app/images/face/0/emo_27.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_27.gif rename to FacewhatML5/app/images/face/0/emo_27.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_28.gif b/FacewhatML5/app/images/face/0/emo_28.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_28.gif rename to FacewhatML5/app/images/face/0/emo_28.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_29.gif b/FacewhatML5/app/images/face/0/emo_29.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_29.gif rename to FacewhatML5/app/images/face/0/emo_29.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_30.gif b/FacewhatML5/app/images/face/0/emo_30.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_30.gif rename to FacewhatML5/app/images/face/0/emo_30.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_31.gif b/FacewhatML5/app/images/face/0/emo_31.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_31.gif rename to FacewhatML5/app/images/face/0/emo_31.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_32.gif b/FacewhatML5/app/images/face/0/emo_32.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_32.gif rename to FacewhatML5/app/images/face/0/emo_32.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_33.gif b/FacewhatML5/app/images/face/0/emo_33.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_33.gif rename to FacewhatML5/app/images/face/0/emo_33.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_34.gif b/FacewhatML5/app/images/face/0/emo_34.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_34.gif rename to FacewhatML5/app/images/face/0/emo_34.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_35.gif b/FacewhatML5/app/images/face/0/emo_35.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_35.gif rename to FacewhatML5/app/images/face/0/emo_35.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_36.gif b/FacewhatML5/app/images/face/0/emo_36.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_36.gif rename to FacewhatML5/app/images/face/0/emo_36.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_37.gif b/FacewhatML5/app/images/face/0/emo_37.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_37.gif rename to FacewhatML5/app/images/face/0/emo_37.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_38.gif b/FacewhatML5/app/images/face/0/emo_38.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_38.gif rename to FacewhatML5/app/images/face/0/emo_38.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_39.gif b/FacewhatML5/app/images/face/0/emo_39.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_39.gif rename to FacewhatML5/app/images/face/0/emo_39.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_40.gif b/FacewhatML5/app/images/face/0/emo_40.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_40.gif rename to FacewhatML5/app/images/face/0/emo_40.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_41.gif b/FacewhatML5/app/images/face/0/emo_41.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_41.gif rename to FacewhatML5/app/images/face/0/emo_41.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_42.gif b/FacewhatML5/app/images/face/0/emo_42.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_42.gif rename to FacewhatML5/app/images/face/0/emo_42.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_43.gif b/FacewhatML5/app/images/face/0/emo_43.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_43.gif rename to FacewhatML5/app/images/face/0/emo_43.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_44.gif b/FacewhatML5/app/images/face/0/emo_44.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_44.gif rename to FacewhatML5/app/images/face/0/emo_44.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_45.gif b/FacewhatML5/app/images/face/0/emo_45.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_45.gif rename to FacewhatML5/app/images/face/0/emo_45.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_46.gif b/FacewhatML5/app/images/face/0/emo_46.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_46.gif rename to FacewhatML5/app/images/face/0/emo_46.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_47.gif b/FacewhatML5/app/images/face/0/emo_47.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_47.gif rename to FacewhatML5/app/images/face/0/emo_47.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_48.gif b/FacewhatML5/app/images/face/0/emo_48.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_48.gif rename to FacewhatML5/app/images/face/0/emo_48.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_49.gif b/FacewhatML5/app/images/face/0/emo_49.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_49.gif rename to FacewhatML5/app/images/face/0/emo_49.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_50.gif b/FacewhatML5/app/images/face/0/emo_50.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_50.gif rename to FacewhatML5/app/images/face/0/emo_50.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_51.gif b/FacewhatML5/app/images/face/0/emo_51.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_51.gif rename to FacewhatML5/app/images/face/0/emo_51.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_52.gif b/FacewhatML5/app/images/face/0/emo_52.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_52.gif rename to FacewhatML5/app/images/face/0/emo_52.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_53.gif b/FacewhatML5/app/images/face/0/emo_53.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_53.gif rename to FacewhatML5/app/images/face/0/emo_53.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_54.gif b/FacewhatML5/app/images/face/0/emo_54.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_54.gif rename to FacewhatML5/app/images/face/0/emo_54.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_55.gif b/FacewhatML5/app/images/face/0/emo_55.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_55.gif rename to FacewhatML5/app/images/face/0/emo_55.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_56.gif b/FacewhatML5/app/images/face/0/emo_56.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_56.gif rename to FacewhatML5/app/images/face/0/emo_56.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_57.gif b/FacewhatML5/app/images/face/0/emo_57.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_57.gif rename to FacewhatML5/app/images/face/0/emo_57.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_58.gif b/FacewhatML5/app/images/face/0/emo_58.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_58.gif rename to FacewhatML5/app/images/face/0/emo_58.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_59.gif b/FacewhatML5/app/images/face/0/emo_59.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_59.gif rename to FacewhatML5/app/images/face/0/emo_59.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_60.gif b/FacewhatML5/app/images/face/0/emo_60.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_60.gif rename to FacewhatML5/app/images/face/0/emo_60.gif diff --git a/FacewhatML5/WebRoot/images/face/0/emo_fw.gif b/FacewhatML5/app/images/face/0/emo_fw.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/0/emo_fw.gif rename to FacewhatML5/app/images/face/0/emo_fw.gif diff --git a/FacewhatML5/WebRoot/images/face/1.gif b/FacewhatML5/app/images/face/1.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/1.gif rename to FacewhatML5/app/images/face/1.gif diff --git a/FacewhatML5/WebRoot/images/face/10.gif b/FacewhatML5/app/images/face/10.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/10.gif rename to FacewhatML5/app/images/face/10.gif diff --git a/FacewhatML5/WebRoot/images/face/11.gif b/FacewhatML5/app/images/face/11.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/11.gif rename to FacewhatML5/app/images/face/11.gif diff --git a/FacewhatML5/WebRoot/images/face/12.gif b/FacewhatML5/app/images/face/12.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/12.gif rename to FacewhatML5/app/images/face/12.gif diff --git a/FacewhatML5/WebRoot/images/face/13.gif b/FacewhatML5/app/images/face/13.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/13.gif rename to FacewhatML5/app/images/face/13.gif diff --git a/FacewhatML5/WebRoot/images/face/14.gif b/FacewhatML5/app/images/face/14.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/14.gif rename to FacewhatML5/app/images/face/14.gif diff --git a/FacewhatML5/WebRoot/images/face/15.gif b/FacewhatML5/app/images/face/15.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/15.gif rename to FacewhatML5/app/images/face/15.gif diff --git a/FacewhatML5/WebRoot/images/face/16.gif b/FacewhatML5/app/images/face/16.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/16.gif rename to FacewhatML5/app/images/face/16.gif diff --git a/FacewhatML5/WebRoot/images/face/17.gif b/FacewhatML5/app/images/face/17.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/17.gif rename to FacewhatML5/app/images/face/17.gif diff --git a/FacewhatML5/WebRoot/images/face/18.gif b/FacewhatML5/app/images/face/18.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/18.gif rename to FacewhatML5/app/images/face/18.gif diff --git a/FacewhatML5/WebRoot/images/face/19.gif b/FacewhatML5/app/images/face/19.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/19.gif rename to FacewhatML5/app/images/face/19.gif diff --git a/FacewhatML5/WebRoot/images/face/2.gif b/FacewhatML5/app/images/face/2.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/2.gif rename to FacewhatML5/app/images/face/2.gif diff --git a/FacewhatML5/WebRoot/images/face/20.gif b/FacewhatML5/app/images/face/20.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/20.gif rename to FacewhatML5/app/images/face/20.gif diff --git a/FacewhatML5/WebRoot/images/face/21.gif b/FacewhatML5/app/images/face/21.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/21.gif rename to FacewhatML5/app/images/face/21.gif diff --git a/FacewhatML5/WebRoot/images/face/22.gif b/FacewhatML5/app/images/face/22.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/22.gif rename to FacewhatML5/app/images/face/22.gif diff --git a/FacewhatML5/WebRoot/images/face/23.gif b/FacewhatML5/app/images/face/23.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/23.gif rename to FacewhatML5/app/images/face/23.gif diff --git a/FacewhatML5/WebRoot/images/face/24.gif b/FacewhatML5/app/images/face/24.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/24.gif rename to FacewhatML5/app/images/face/24.gif diff --git a/FacewhatML5/WebRoot/images/face/29.gif b/FacewhatML5/app/images/face/29.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/29.gif rename to FacewhatML5/app/images/face/29.gif diff --git a/FacewhatML5/WebRoot/images/face/3.gif b/FacewhatML5/app/images/face/3.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/3.gif rename to FacewhatML5/app/images/face/3.gif diff --git a/FacewhatML5/WebRoot/images/face/30.gif b/FacewhatML5/app/images/face/30.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/30.gif rename to FacewhatML5/app/images/face/30.gif diff --git a/FacewhatML5/WebRoot/images/face/32.gif b/FacewhatML5/app/images/face/32.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/32.gif rename to FacewhatML5/app/images/face/32.gif diff --git a/FacewhatML5/WebRoot/images/face/34.gif b/FacewhatML5/app/images/face/34.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/34.gif rename to FacewhatML5/app/images/face/34.gif diff --git a/FacewhatML5/WebRoot/images/face/35.gif b/FacewhatML5/app/images/face/35.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/35.gif rename to FacewhatML5/app/images/face/35.gif diff --git a/FacewhatML5/WebRoot/images/face/36.gif b/FacewhatML5/app/images/face/36.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/36.gif rename to FacewhatML5/app/images/face/36.gif diff --git a/FacewhatML5/WebRoot/images/face/38.gif b/FacewhatML5/app/images/face/38.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/38.gif rename to FacewhatML5/app/images/face/38.gif diff --git a/FacewhatML5/WebRoot/images/face/4.gif b/FacewhatML5/app/images/face/4.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/4.gif rename to FacewhatML5/app/images/face/4.gif diff --git a/FacewhatML5/WebRoot/images/face/40.gif b/FacewhatML5/app/images/face/40.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/40.gif rename to FacewhatML5/app/images/face/40.gif diff --git a/FacewhatML5/WebRoot/images/face/41.gif b/FacewhatML5/app/images/face/41.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/41.gif rename to FacewhatML5/app/images/face/41.gif diff --git a/FacewhatML5/WebRoot/images/face/42.gif b/FacewhatML5/app/images/face/42.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/42.gif rename to FacewhatML5/app/images/face/42.gif diff --git a/FacewhatML5/WebRoot/images/face/43.gif b/FacewhatML5/app/images/face/43.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/43.gif rename to FacewhatML5/app/images/face/43.gif diff --git a/FacewhatML5/WebRoot/images/face/44.gif b/FacewhatML5/app/images/face/44.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/44.gif rename to FacewhatML5/app/images/face/44.gif diff --git a/FacewhatML5/WebRoot/images/face/45.gif b/FacewhatML5/app/images/face/45.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/45.gif rename to FacewhatML5/app/images/face/45.gif diff --git a/FacewhatML5/WebRoot/images/face/46.gif b/FacewhatML5/app/images/face/46.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/46.gif rename to FacewhatML5/app/images/face/46.gif diff --git a/FacewhatML5/WebRoot/images/face/47.gif b/FacewhatML5/app/images/face/47.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/47.gif rename to FacewhatML5/app/images/face/47.gif diff --git a/FacewhatML5/WebRoot/images/face/48.gif b/FacewhatML5/app/images/face/48.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/48.gif rename to FacewhatML5/app/images/face/48.gif diff --git a/FacewhatML5/WebRoot/images/face/49.gif b/FacewhatML5/app/images/face/49.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/49.gif rename to FacewhatML5/app/images/face/49.gif diff --git a/FacewhatML5/WebRoot/images/face/5.gif b/FacewhatML5/app/images/face/5.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/5.gif rename to FacewhatML5/app/images/face/5.gif diff --git a/FacewhatML5/WebRoot/images/face/50.gif b/FacewhatML5/app/images/face/50.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/50.gif rename to FacewhatML5/app/images/face/50.gif diff --git a/FacewhatML5/WebRoot/images/face/51.gif b/FacewhatML5/app/images/face/51.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/51.gif rename to FacewhatML5/app/images/face/51.gif diff --git a/FacewhatML5/WebRoot/images/face/52.gif b/FacewhatML5/app/images/face/52.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/52.gif rename to FacewhatML5/app/images/face/52.gif diff --git a/FacewhatML5/WebRoot/images/face/53.gif b/FacewhatML5/app/images/face/53.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/53.gif rename to FacewhatML5/app/images/face/53.gif diff --git a/FacewhatML5/WebRoot/images/face/55.gif b/FacewhatML5/app/images/face/55.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/55.gif rename to FacewhatML5/app/images/face/55.gif diff --git a/FacewhatML5/WebRoot/images/face/56.gif b/FacewhatML5/app/images/face/56.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/56.gif rename to FacewhatML5/app/images/face/56.gif diff --git a/FacewhatML5/WebRoot/images/face/57.gif b/FacewhatML5/app/images/face/57.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/57.gif rename to FacewhatML5/app/images/face/57.gif diff --git a/FacewhatML5/WebRoot/images/face/58.gif b/FacewhatML5/app/images/face/58.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/58.gif rename to FacewhatML5/app/images/face/58.gif diff --git a/FacewhatML5/WebRoot/images/face/59.gif b/FacewhatML5/app/images/face/59.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/59.gif rename to FacewhatML5/app/images/face/59.gif diff --git a/FacewhatML5/WebRoot/images/face/6.gif b/FacewhatML5/app/images/face/6.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/6.gif rename to FacewhatML5/app/images/face/6.gif diff --git a/FacewhatML5/WebRoot/images/face/60.gif b/FacewhatML5/app/images/face/60.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/60.gif rename to FacewhatML5/app/images/face/60.gif diff --git a/FacewhatML5/WebRoot/images/face/7.gif b/FacewhatML5/app/images/face/7.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/7.gif rename to FacewhatML5/app/images/face/7.gif diff --git a/FacewhatML5/WebRoot/images/face/8.gif b/FacewhatML5/app/images/face/8.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/8.gif rename to FacewhatML5/app/images/face/8.gif diff --git a/FacewhatML5/WebRoot/images/face/9.gif b/FacewhatML5/app/images/face/9.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/9.gif rename to FacewhatML5/app/images/face/9.gif diff --git a/FacewhatML5/WebRoot/images/face/temp.gif b/FacewhatML5/app/images/face/temp.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp.gif rename to FacewhatML5/app/images/face/temp.gif diff --git a/FacewhatML5/WebRoot/images/face/temp1.gif b/FacewhatML5/app/images/face/temp1.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp1.gif rename to FacewhatML5/app/images/face/temp1.gif diff --git a/FacewhatML5/WebRoot/images/face/temp10.gif b/FacewhatML5/app/images/face/temp10.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp10.gif rename to FacewhatML5/app/images/face/temp10.gif diff --git a/FacewhatML5/WebRoot/images/face/temp11.gif b/FacewhatML5/app/images/face/temp11.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp11.gif rename to FacewhatML5/app/images/face/temp11.gif diff --git a/FacewhatML5/WebRoot/images/face/temp12.gif b/FacewhatML5/app/images/face/temp12.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp12.gif rename to FacewhatML5/app/images/face/temp12.gif diff --git a/FacewhatML5/WebRoot/images/face/temp13.gif b/FacewhatML5/app/images/face/temp13.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp13.gif rename to FacewhatML5/app/images/face/temp13.gif diff --git a/FacewhatML5/WebRoot/images/face/temp14.gif b/FacewhatML5/app/images/face/temp14.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp14.gif rename to FacewhatML5/app/images/face/temp14.gif diff --git a/FacewhatML5/WebRoot/images/face/temp15.gif b/FacewhatML5/app/images/face/temp15.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp15.gif rename to FacewhatML5/app/images/face/temp15.gif diff --git a/FacewhatML5/WebRoot/images/face/temp16.gif b/FacewhatML5/app/images/face/temp16.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp16.gif rename to FacewhatML5/app/images/face/temp16.gif diff --git a/FacewhatML5/WebRoot/images/face/temp17.gif b/FacewhatML5/app/images/face/temp17.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp17.gif rename to FacewhatML5/app/images/face/temp17.gif diff --git a/FacewhatML5/WebRoot/images/face/temp2.gif b/FacewhatML5/app/images/face/temp2.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp2.gif rename to FacewhatML5/app/images/face/temp2.gif diff --git a/FacewhatML5/WebRoot/images/face/temp3.gif b/FacewhatML5/app/images/face/temp3.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp3.gif rename to FacewhatML5/app/images/face/temp3.gif diff --git a/FacewhatML5/WebRoot/images/face/temp4.gif b/FacewhatML5/app/images/face/temp4.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp4.gif rename to FacewhatML5/app/images/face/temp4.gif diff --git a/FacewhatML5/WebRoot/images/face/temp5.gif b/FacewhatML5/app/images/face/temp5.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp5.gif rename to FacewhatML5/app/images/face/temp5.gif diff --git a/FacewhatML5/WebRoot/images/face/temp6.gif b/FacewhatML5/app/images/face/temp6.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp6.gif rename to FacewhatML5/app/images/face/temp6.gif diff --git a/FacewhatML5/WebRoot/images/face/temp7.gif b/FacewhatML5/app/images/face/temp7.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp7.gif rename to FacewhatML5/app/images/face/temp7.gif diff --git a/FacewhatML5/WebRoot/images/face/temp8.gif b/FacewhatML5/app/images/face/temp8.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp8.gif rename to FacewhatML5/app/images/face/temp8.gif diff --git a/FacewhatML5/WebRoot/images/face/temp9.gif b/FacewhatML5/app/images/face/temp9.gif similarity index 100% rename from FacewhatML5/WebRoot/images/face/temp9.gif rename to FacewhatML5/app/images/face/temp9.gif diff --git a/FacewhatML5/WebRoot/images/facebackground.jpg b/FacewhatML5/app/images/facebackground.jpg similarity index 100% rename from FacewhatML5/WebRoot/images/facebackground.jpg rename to FacewhatML5/app/images/facebackground.jpg diff --git a/FacewhatML5/WebRoot/images/file.png b/FacewhatML5/app/images/file.png similarity index 100% rename from FacewhatML5/WebRoot/images/file.png rename to FacewhatML5/app/images/file.png diff --git a/FacewhatML5/WebRoot/images/file2.png b/FacewhatML5/app/images/file2.png similarity index 100% rename from FacewhatML5/WebRoot/images/file2.png rename to FacewhatML5/app/images/file2.png diff --git a/FacewhatML5/WebRoot/images/folder1.png b/FacewhatML5/app/images/folder1.png similarity index 100% rename from FacewhatML5/WebRoot/images/folder1.png rename to FacewhatML5/app/images/folder1.png diff --git a/FacewhatML5/WebRoot/images/group/OM.png b/FacewhatML5/app/images/group/OM.png similarity index 100% rename from FacewhatML5/WebRoot/images/group/OM.png rename to FacewhatML5/app/images/group/OM.png diff --git a/FacewhatML5/WebRoot/images/group/arrowright.png b/FacewhatML5/app/images/group/arrowright.png similarity index 100% rename from FacewhatML5/WebRoot/images/group/arrowright.png rename to FacewhatML5/app/images/group/arrowright.png diff --git a/FacewhatML5/WebRoot/images/group/config.png b/FacewhatML5/app/images/group/config.png similarity index 100% rename from FacewhatML5/WebRoot/images/group/config.png rename to FacewhatML5/app/images/group/config.png diff --git a/FacewhatML5/WebRoot/images/group/handright.png b/FacewhatML5/app/images/group/handright.png similarity index 100% rename from FacewhatML5/WebRoot/images/group/handright.png rename to FacewhatML5/app/images/group/handright.png diff --git a/FacewhatML5/WebRoot/images/group/lock.png b/FacewhatML5/app/images/group/lock.png similarity index 100% rename from FacewhatML5/WebRoot/images/group/lock.png rename to FacewhatML5/app/images/group/lock.png diff --git a/FacewhatML5/WebRoot/images/historybackground.jpeg b/FacewhatML5/app/images/historybackground.jpeg similarity index 100% rename from FacewhatML5/WebRoot/images/historybackground.jpeg rename to FacewhatML5/app/images/historybackground.jpeg diff --git a/FacewhatML5/WebRoot/images/historybackground2.jpg b/FacewhatML5/app/images/historybackground2.jpg similarity index 100% rename from FacewhatML5/WebRoot/images/historybackground2.jpg rename to FacewhatML5/app/images/historybackground2.jpg diff --git a/FacewhatML5/WebRoot/images/historybackground3.jpg b/FacewhatML5/app/images/historybackground3.jpg similarity index 100% rename from FacewhatML5/WebRoot/images/historybackground3.jpg rename to FacewhatML5/app/images/historybackground3.jpg diff --git a/FacewhatML5/WebRoot/images/icon.png b/FacewhatML5/app/images/icon.png similarity index 100% rename from FacewhatML5/WebRoot/images/icon.png rename to FacewhatML5/app/images/icon.png diff --git a/FacewhatML5/WebRoot/images/imagedamage.png b/FacewhatML5/app/images/imagedamage.png similarity index 100% rename from FacewhatML5/WebRoot/images/imagedamage.png rename to FacewhatML5/app/images/imagedamage.png diff --git a/FacewhatML5/WebRoot/images/img.png b/FacewhatML5/app/images/img.png similarity index 100% rename from FacewhatML5/WebRoot/images/img.png rename to FacewhatML5/app/images/img.png diff --git a/FacewhatML5/WebRoot/images/info.png b/FacewhatML5/app/images/info.png similarity index 100% rename from FacewhatML5/WebRoot/images/info.png rename to FacewhatML5/app/images/info.png diff --git a/FacewhatML5/WebRoot/images/loading.gif b/FacewhatML5/app/images/loading.gif similarity index 100% rename from FacewhatML5/WebRoot/images/loading.gif rename to FacewhatML5/app/images/loading.gif diff --git a/FacewhatML5/WebRoot/images/login/hand.png b/FacewhatML5/app/images/login/hand.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/hand.png rename to FacewhatML5/app/images/login/hand.png diff --git a/FacewhatML5/WebRoot/images/login/left-handing.png b/FacewhatML5/app/images/login/left-handing.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/left-handing.png rename to FacewhatML5/app/images/login/left-handing.png diff --git a/FacewhatML5/WebRoot/images/login/left_hand.png b/FacewhatML5/app/images/login/left_hand.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/left_hand.png rename to FacewhatML5/app/images/login/left_hand.png diff --git a/FacewhatML5/WebRoot/images/login/password.png b/FacewhatML5/app/images/login/password.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/password.png rename to FacewhatML5/app/images/login/password.png diff --git a/FacewhatML5/WebRoot/images/login/right_hand.png b/FacewhatML5/app/images/login/right_hand.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/right_hand.png rename to FacewhatML5/app/images/login/right_hand.png diff --git a/FacewhatML5/WebRoot/images/login/right_handing.png b/FacewhatML5/app/images/login/right_handing.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/right_handing.png rename to FacewhatML5/app/images/login/right_handing.png diff --git a/FacewhatML5/WebRoot/images/login/servers.png b/FacewhatML5/app/images/login/servers.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/servers.png rename to FacewhatML5/app/images/login/servers.png diff --git a/FacewhatML5/WebRoot/images/login/tou.png b/FacewhatML5/app/images/login/tou.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/tou.png rename to FacewhatML5/app/images/login/tou.png diff --git a/FacewhatML5/WebRoot/images/login/username.png b/FacewhatML5/app/images/login/username.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/username.png rename to FacewhatML5/app/images/login/username.png diff --git a/FacewhatML5/WebRoot/images/login/username1.png b/FacewhatML5/app/images/login/username1.png similarity index 100% rename from FacewhatML5/WebRoot/images/login/username1.png rename to FacewhatML5/app/images/login/username1.png diff --git a/FacewhatML5/WebRoot/images/logout.png b/FacewhatML5/app/images/logout.png similarity index 100% rename from FacewhatML5/WebRoot/images/logout.png rename to FacewhatML5/app/images/logout.png diff --git a/FacewhatML5/WebRoot/images/message8.png b/FacewhatML5/app/images/message8.png similarity index 100% rename from FacewhatML5/WebRoot/images/message8.png rename to FacewhatML5/app/images/message8.png diff --git a/FacewhatML5/WebRoot/images/point.png b/FacewhatML5/app/images/point.png similarity index 100% rename from FacewhatML5/WebRoot/images/point.png rename to FacewhatML5/app/images/point.png diff --git a/FacewhatML5/WebRoot/images/round.png b/FacewhatML5/app/images/round.png similarity index 100% rename from FacewhatML5/WebRoot/images/round.png rename to FacewhatML5/app/images/round.png diff --git a/FacewhatML5/WebRoot/index.html b/FacewhatML5/app/index.html similarity index 98% rename from FacewhatML5/WebRoot/index.html rename to FacewhatML5/app/index.html index 62b077f..419ece2 100644 --- a/FacewhatML5/WebRoot/index.html +++ b/FacewhatML5/app/index.html @@ -45,10 +45,7 @@ - - - - +
@@ -74,8 +71,8 @@
+
--> +
+ + +
+
+
+
+
+
+
+

+ + +

+

+ + +

+

+ + +

+
+

+ + + 登录状态 + + + + + + 登录 + + +

+
+
+
+ + diff --git a/FacewhatML5/app/scripts/controller/login-controller.js b/FacewhatML5/app/scripts/controller/login-controller.js new file mode 100644 index 0000000..2d7c0c2 --- /dev/null +++ b/FacewhatML5/app/scripts/controller/login-controller.js @@ -0,0 +1,84 @@ +/** + * Created by chenyi on 2017-09-22. + */ +//$(document).ready(function () { +function bindLoginClick() { + XoW.logger.d("bindLoginClick() " + XoW.utils.getCurrentDatetime()); + // alert(); + gblMgr = new XoW.GlobalManager(); + + $("#loginIMSvr").bind("click", function () { + //$('#loginSvr').bind('click', function() { + alert("helloworld"); + var serviceURL = $('#service').val(); + var username = $('#username').val(); + var pass = $('#password').val(); + if (null == serviceURL || "" == serviceURL) { + alert("请输入服务器名！"); + return false; + } + if (null == username || "" == username) { + alert("请输入用户名！"); + return false; + } + if (null == pass || "" == pass) { + alert("请输入密码！"); + return false; + } + gblMgr.connect(serviceURL, username, pass); + }); + + $('#login2').bind('click', function () { + var serviceURL = $('#service').val(); + var username = $('#username').val(); + var pass = $('#password').val(); + if (null == serviceURL || "" == serviceURL) { + alert("请输入服务器名！"); + return false; + } + if (null == username || "" == username) { + alert("请输入用户名！"); + return false; + } + if (null == pass || "" == pass) { + alert("请输入密码！"); + return false; + } + + gblMgr.connect(serviceURL, username, pass); + }); +} + + +$(function(){ + XoW.logger.d("on document ready"); + + //得到焦点 + $("#password").focus(function(){ + $("#left_hand").animate({ + left: "150", + top: " -38" + },{step: function(){ + if(parseInt($("#left_hand").css("left"))>140){ + $("#left_hand").attr("class","left_hand"); + } + }}, 2000); + $("#right_hand").animate({ + right: "-64", + top: "-38px" + },{step: function(){ + if(parseInt($("#right_hand").css("right"))> -70){ + $("#right_hand").attr("class","right_hand"); + } + }}, 2000); + }); + //失去焦点 + $("#password").blur(function(){ + $("#left_hand").attr("class","initial_left_hand"); + $("#left_hand").attr("style","left:100px;top:-12px;"); + $("#right_hand").attr("class","initial_right_hand"); + $("#right_hand").attr("style","right:-112px;top:-12px"); + }); + + bindLoginClick(); +}); \ No newline at end of file diff --git a/FacewhatML5/WebRoot/scripts/download/download.js b/FacewhatML5/app/scripts/download/download.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/download/download.js rename to FacewhatML5/app/scripts/download/download.js diff --git "a/FacewhatML5/WebRoot/scripts/jquery/jquery-1.11.1 - \345\211\257\346\234\254.js" "b/FacewhatML5/app/scripts/jquery/jquery-1.11.1 - \345\211\257\346\234\254.js" similarity index 100% rename from "FacewhatML5/WebRoot/scripts/jquery/jquery-1.11.1 - \345\211\257\346\234\254.js" rename to "FacewhatML5/app/scripts/jquery/jquery-1.11.1 - \345\211\257\346\234\254.js" diff --git a/FacewhatML5/WebRoot/scripts/jquery/jquery-1.11.1.js b/FacewhatML5/app/scripts/jquery/jquery-1.11.1.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/jquery-1.11.1.js rename to FacewhatML5/app/scripts/jquery/jquery-1.11.1.js diff --git a/FacewhatML5/WebRoot/scripts/jquery/jquery-1.4.2.js b/FacewhatML5/app/scripts/jquery/jquery-1.4.2.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/jquery-1.4.2.js rename to FacewhatML5/app/scripts/jquery/jquery-1.4.2.js diff --git a/FacewhatML5/WebRoot/scripts/jquery/jquery.caret.js b/FacewhatML5/app/scripts/jquery/jquery.caret.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/jquery.caret.js rename to FacewhatML5/app/scripts/jquery/jquery.caret.js diff --git a/FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.css b/FacewhatML5/app/scripts/jquery/ui/jquery-ui.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.css rename to FacewhatML5/app/scripts/jquery/ui/jquery-ui.css diff --git a/FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.js b/FacewhatML5/app/scripts/jquery/ui/jquery-ui.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.js rename to FacewhatML5/app/scripts/jquery/ui/jquery-ui.js diff --git a/FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.min.css b/FacewhatML5/app/scripts/jquery/ui/jquery-ui.min.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.min.css rename to FacewhatML5/app/scripts/jquery/ui/jquery-ui.min.css diff --git a/FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.min.js b/FacewhatML5/app/scripts/jquery/ui/jquery-ui.min.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.min.js rename to FacewhatML5/app/scripts/jquery/ui/jquery-ui.min.js diff --git a/FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.structure.css b/FacewhatML5/app/scripts/jquery/ui/jquery-ui.structure.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.structure.css rename to FacewhatML5/app/scripts/jquery/ui/jquery-ui.structure.css diff --git a/FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.structure.min.css b/FacewhatML5/app/scripts/jquery/ui/jquery-ui.structure.min.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.structure.min.css rename to FacewhatML5/app/scripts/jquery/ui/jquery-ui.structure.min.css diff --git a/FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.theme.css b/FacewhatML5/app/scripts/jquery/ui/jquery-ui.theme.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.theme.css rename to FacewhatML5/app/scripts/jquery/ui/jquery-ui.theme.css diff --git a/FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.theme.min.css b/FacewhatML5/app/scripts/jquery/ui/jquery-ui.theme.min.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/jquery/ui/jquery-ui.theme.min.css rename to FacewhatML5/app/scripts/jquery/ui/jquery-ui.theme.min.css diff --git a/FacewhatML5/WebRoot/scripts/layui/css/layui.css b/FacewhatML5/app/scripts/layui/css/layui.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/layui.css rename to FacewhatML5/app/scripts/layui/css/layui.css diff --git a/FacewhatML5/WebRoot/scripts/layui/css/layui.mobile.css b/FacewhatML5/app/scripts/layui/css/layui.mobile.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/layui.mobile.css rename to FacewhatML5/app/scripts/layui/css/layui.mobile.css diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/code.css b/FacewhatML5/app/scripts/layui/css/modules/code.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/code.css rename to FacewhatML5/app/scripts/layui/css/modules/code.css diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/laydate/icon.png b/FacewhatML5/app/scripts/layui/css/modules/laydate/icon.png similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/laydate/icon.png rename to FacewhatML5/app/scripts/layui/css/modules/laydate/icon.png diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/laydate/laydate.css b/FacewhatML5/app/scripts/layui/css/modules/laydate/laydate.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/laydate/laydate.css rename to FacewhatML5/app/scripts/layui/css/modules/laydate/laydate.css diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/icon-ext.png b/FacewhatML5/app/scripts/layui/css/modules/layer/default/icon-ext.png similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/icon-ext.png rename to FacewhatML5/app/scripts/layui/css/modules/layer/default/icon-ext.png diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/icon.png b/FacewhatML5/app/scripts/layui/css/modules/layer/default/icon.png similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/icon.png rename to FacewhatML5/app/scripts/layui/css/modules/layer/default/icon.png diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/layer.css b/FacewhatML5/app/scripts/layui/css/modules/layer/default/layer.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/layer.css rename to FacewhatML5/app/scripts/layui/css/modules/layer/default/layer.css diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/loading-0.gif b/FacewhatML5/app/scripts/layui/css/modules/layer/default/loading-0.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/loading-0.gif rename to FacewhatML5/app/scripts/layui/css/modules/layer/default/loading-0.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/loading-1.gif b/FacewhatML5/app/scripts/layui/css/modules/layer/default/loading-1.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/loading-1.gif rename to FacewhatML5/app/scripts/layui/css/modules/layer/default/loading-1.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/loading-2.gif b/FacewhatML5/app/scripts/layui/css/modules/layer/default/loading-2.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/css/modules/layer/default/loading-2.gif rename to FacewhatML5/app/scripts/layui/css/modules/layer/default/loading-2.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/font/iconfont.eot b/FacewhatML5/app/scripts/layui/font/iconfont.eot similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/font/iconfont.eot rename to FacewhatML5/app/scripts/layui/font/iconfont.eot diff --git a/FacewhatML5/WebRoot/scripts/layui/font/iconfont.svg b/FacewhatML5/app/scripts/layui/font/iconfont.svg similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/font/iconfont.svg rename to FacewhatML5/app/scripts/layui/font/iconfont.svg diff --git a/FacewhatML5/WebRoot/scripts/layui/font/iconfont.ttf b/FacewhatML5/app/scripts/layui/font/iconfont.ttf similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/font/iconfont.ttf rename to FacewhatML5/app/scripts/layui/font/iconfont.ttf diff --git a/FacewhatML5/WebRoot/scripts/layui/font/iconfont.woff b/FacewhatML5/app/scripts/layui/font/iconfont.woff similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/font/iconfont.woff rename to FacewhatML5/app/scripts/layui/font/iconfont.woff diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/0.gif b/FacewhatML5/app/scripts/layui/images/face/0.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/0.gif rename to FacewhatML5/app/scripts/layui/images/face/0.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/1.gif b/FacewhatML5/app/scripts/layui/images/face/1.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/1.gif rename to FacewhatML5/app/scripts/layui/images/face/1.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/10.gif b/FacewhatML5/app/scripts/layui/images/face/10.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/10.gif rename to FacewhatML5/app/scripts/layui/images/face/10.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/11.gif b/FacewhatML5/app/scripts/layui/images/face/11.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/11.gif rename to FacewhatML5/app/scripts/layui/images/face/11.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/12.gif b/FacewhatML5/app/scripts/layui/images/face/12.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/12.gif rename to FacewhatML5/app/scripts/layui/images/face/12.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/13.gif b/FacewhatML5/app/scripts/layui/images/face/13.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/13.gif rename to FacewhatML5/app/scripts/layui/images/face/13.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/14.gif b/FacewhatML5/app/scripts/layui/images/face/14.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/14.gif rename to FacewhatML5/app/scripts/layui/images/face/14.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/15.gif b/FacewhatML5/app/scripts/layui/images/face/15.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/15.gif rename to FacewhatML5/app/scripts/layui/images/face/15.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/16.gif b/FacewhatML5/app/scripts/layui/images/face/16.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/16.gif rename to FacewhatML5/app/scripts/layui/images/face/16.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/17.gif b/FacewhatML5/app/scripts/layui/images/face/17.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/17.gif rename to FacewhatML5/app/scripts/layui/images/face/17.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/18.gif b/FacewhatML5/app/scripts/layui/images/face/18.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/18.gif rename to FacewhatML5/app/scripts/layui/images/face/18.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/19.gif b/FacewhatML5/app/scripts/layui/images/face/19.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/19.gif rename to FacewhatML5/app/scripts/layui/images/face/19.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/2.gif b/FacewhatML5/app/scripts/layui/images/face/2.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/2.gif rename to FacewhatML5/app/scripts/layui/images/face/2.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/20.gif b/FacewhatML5/app/scripts/layui/images/face/20.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/20.gif rename to FacewhatML5/app/scripts/layui/images/face/20.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/21.gif b/FacewhatML5/app/scripts/layui/images/face/21.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/21.gif rename to FacewhatML5/app/scripts/layui/images/face/21.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/22.gif b/FacewhatML5/app/scripts/layui/images/face/22.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/22.gif rename to FacewhatML5/app/scripts/layui/images/face/22.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/23.gif b/FacewhatML5/app/scripts/layui/images/face/23.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/23.gif rename to FacewhatML5/app/scripts/layui/images/face/23.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/24.gif b/FacewhatML5/app/scripts/layui/images/face/24.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/24.gif rename to FacewhatML5/app/scripts/layui/images/face/24.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/25.gif b/FacewhatML5/app/scripts/layui/images/face/25.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/25.gif rename to FacewhatML5/app/scripts/layui/images/face/25.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/26.gif b/FacewhatML5/app/scripts/layui/images/face/26.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/26.gif rename to FacewhatML5/app/scripts/layui/images/face/26.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/27.gif b/FacewhatML5/app/scripts/layui/images/face/27.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/27.gif rename to FacewhatML5/app/scripts/layui/images/face/27.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/28.gif b/FacewhatML5/app/scripts/layui/images/face/28.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/28.gif rename to FacewhatML5/app/scripts/layui/images/face/28.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/29.gif b/FacewhatML5/app/scripts/layui/images/face/29.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/29.gif rename to FacewhatML5/app/scripts/layui/images/face/29.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/3.gif b/FacewhatML5/app/scripts/layui/images/face/3.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/3.gif rename to FacewhatML5/app/scripts/layui/images/face/3.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/30.gif b/FacewhatML5/app/scripts/layui/images/face/30.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/30.gif rename to FacewhatML5/app/scripts/layui/images/face/30.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/31.gif b/FacewhatML5/app/scripts/layui/images/face/31.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/31.gif rename to FacewhatML5/app/scripts/layui/images/face/31.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/32.gif b/FacewhatML5/app/scripts/layui/images/face/32.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/32.gif rename to FacewhatML5/app/scripts/layui/images/face/32.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/33.gif b/FacewhatML5/app/scripts/layui/images/face/33.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/33.gif rename to FacewhatML5/app/scripts/layui/images/face/33.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/34.gif b/FacewhatML5/app/scripts/layui/images/face/34.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/34.gif rename to FacewhatML5/app/scripts/layui/images/face/34.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/35.gif b/FacewhatML5/app/scripts/layui/images/face/35.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/35.gif rename to FacewhatML5/app/scripts/layui/images/face/35.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/36.gif b/FacewhatML5/app/scripts/layui/images/face/36.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/36.gif rename to FacewhatML5/app/scripts/layui/images/face/36.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/37.gif b/FacewhatML5/app/scripts/layui/images/face/37.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/37.gif rename to FacewhatML5/app/scripts/layui/images/face/37.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/38.gif b/FacewhatML5/app/scripts/layui/images/face/38.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/38.gif rename to FacewhatML5/app/scripts/layui/images/face/38.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/39.gif b/FacewhatML5/app/scripts/layui/images/face/39.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/39.gif rename to FacewhatML5/app/scripts/layui/images/face/39.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/4.gif b/FacewhatML5/app/scripts/layui/images/face/4.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/4.gif rename to FacewhatML5/app/scripts/layui/images/face/4.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/40.gif b/FacewhatML5/app/scripts/layui/images/face/40.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/40.gif rename to FacewhatML5/app/scripts/layui/images/face/40.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/41.gif b/FacewhatML5/app/scripts/layui/images/face/41.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/41.gif rename to FacewhatML5/app/scripts/layui/images/face/41.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/42.gif b/FacewhatML5/app/scripts/layui/images/face/42.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/42.gif rename to FacewhatML5/app/scripts/layui/images/face/42.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/43.gif b/FacewhatML5/app/scripts/layui/images/face/43.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/43.gif rename to FacewhatML5/app/scripts/layui/images/face/43.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/44.gif b/FacewhatML5/app/scripts/layui/images/face/44.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/44.gif rename to FacewhatML5/app/scripts/layui/images/face/44.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/45.gif b/FacewhatML5/app/scripts/layui/images/face/45.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/45.gif rename to FacewhatML5/app/scripts/layui/images/face/45.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/46.gif b/FacewhatML5/app/scripts/layui/images/face/46.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/46.gif rename to FacewhatML5/app/scripts/layui/images/face/46.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/47.gif b/FacewhatML5/app/scripts/layui/images/face/47.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/47.gif rename to FacewhatML5/app/scripts/layui/images/face/47.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/48.gif b/FacewhatML5/app/scripts/layui/images/face/48.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/48.gif rename to FacewhatML5/app/scripts/layui/images/face/48.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/49.gif b/FacewhatML5/app/scripts/layui/images/face/49.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/49.gif rename to FacewhatML5/app/scripts/layui/images/face/49.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/5.gif b/FacewhatML5/app/scripts/layui/images/face/5.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/5.gif rename to FacewhatML5/app/scripts/layui/images/face/5.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/50.gif b/FacewhatML5/app/scripts/layui/images/face/50.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/50.gif rename to FacewhatML5/app/scripts/layui/images/face/50.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/51.gif b/FacewhatML5/app/scripts/layui/images/face/51.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/51.gif rename to FacewhatML5/app/scripts/layui/images/face/51.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/52.gif b/FacewhatML5/app/scripts/layui/images/face/52.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/52.gif rename to FacewhatML5/app/scripts/layui/images/face/52.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/53.gif b/FacewhatML5/app/scripts/layui/images/face/53.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/53.gif rename to FacewhatML5/app/scripts/layui/images/face/53.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/54.gif b/FacewhatML5/app/scripts/layui/images/face/54.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/54.gif rename to FacewhatML5/app/scripts/layui/images/face/54.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/55.gif b/FacewhatML5/app/scripts/layui/images/face/55.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/55.gif rename to FacewhatML5/app/scripts/layui/images/face/55.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/56.gif b/FacewhatML5/app/scripts/layui/images/face/56.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/56.gif rename to FacewhatML5/app/scripts/layui/images/face/56.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/57.gif b/FacewhatML5/app/scripts/layui/images/face/57.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/57.gif rename to FacewhatML5/app/scripts/layui/images/face/57.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/58.gif b/FacewhatML5/app/scripts/layui/images/face/58.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/58.gif rename to FacewhatML5/app/scripts/layui/images/face/58.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/59.gif b/FacewhatML5/app/scripts/layui/images/face/59.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/59.gif rename to FacewhatML5/app/scripts/layui/images/face/59.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/6.gif b/FacewhatML5/app/scripts/layui/images/face/6.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/6.gif rename to FacewhatML5/app/scripts/layui/images/face/6.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/60.gif b/FacewhatML5/app/scripts/layui/images/face/60.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/60.gif rename to FacewhatML5/app/scripts/layui/images/face/60.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/61.gif b/FacewhatML5/app/scripts/layui/images/face/61.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/61.gif rename to FacewhatML5/app/scripts/layui/images/face/61.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/62.gif b/FacewhatML5/app/scripts/layui/images/face/62.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/62.gif rename to FacewhatML5/app/scripts/layui/images/face/62.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/63.gif b/FacewhatML5/app/scripts/layui/images/face/63.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/63.gif rename to FacewhatML5/app/scripts/layui/images/face/63.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/64.gif b/FacewhatML5/app/scripts/layui/images/face/64.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/64.gif rename to FacewhatML5/app/scripts/layui/images/face/64.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/65.gif b/FacewhatML5/app/scripts/layui/images/face/65.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/65.gif rename to FacewhatML5/app/scripts/layui/images/face/65.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/66.gif b/FacewhatML5/app/scripts/layui/images/face/66.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/66.gif rename to FacewhatML5/app/scripts/layui/images/face/66.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/67.gif b/FacewhatML5/app/scripts/layui/images/face/67.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/67.gif rename to FacewhatML5/app/scripts/layui/images/face/67.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/68.gif b/FacewhatML5/app/scripts/layui/images/face/68.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/68.gif rename to FacewhatML5/app/scripts/layui/images/face/68.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/69.gif b/FacewhatML5/app/scripts/layui/images/face/69.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/69.gif rename to FacewhatML5/app/scripts/layui/images/face/69.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/7.gif b/FacewhatML5/app/scripts/layui/images/face/7.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/7.gif rename to FacewhatML5/app/scripts/layui/images/face/7.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/70.gif b/FacewhatML5/app/scripts/layui/images/face/70.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/70.gif rename to FacewhatML5/app/scripts/layui/images/face/70.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/71.gif b/FacewhatML5/app/scripts/layui/images/face/71.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/71.gif rename to FacewhatML5/app/scripts/layui/images/face/71.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/8.gif b/FacewhatML5/app/scripts/layui/images/face/8.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/8.gif rename to FacewhatML5/app/scripts/layui/images/face/8.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/images/face/9.gif b/FacewhatML5/app/scripts/layui/images/face/9.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/images/face/9.gif rename to FacewhatML5/app/scripts/layui/images/face/9.gif diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/dest/layui.all.js b/FacewhatML5/app/scripts/layui/lay/dest/layui.all.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/dest/layui.all.js rename to FacewhatML5/app/scripts/layui/lay/dest/layui.all.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/code.js b/FacewhatML5/app/scripts/layui/lay/modules/code.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/code.js rename to FacewhatML5/app/scripts/layui/lay/modules/code.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/element.js b/FacewhatML5/app/scripts/layui/lay/modules/element.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/element.js rename to FacewhatML5/app/scripts/layui/lay/modules/element.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/flow.js b/FacewhatML5/app/scripts/layui/lay/modules/flow.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/flow.js rename to FacewhatML5/app/scripts/layui/lay/modules/flow.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/form.js b/FacewhatML5/app/scripts/layui/lay/modules/form.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/form.js rename to FacewhatML5/app/scripts/layui/lay/modules/form.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/jquery.js b/FacewhatML5/app/scripts/layui/lay/modules/jquery.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/jquery.js rename to FacewhatML5/app/scripts/layui/lay/modules/jquery.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/laydate.js b/FacewhatML5/app/scripts/layui/lay/modules/laydate.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/laydate.js rename to FacewhatML5/app/scripts/layui/lay/modules/laydate.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/layedit.js b/FacewhatML5/app/scripts/layui/lay/modules/layedit.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/layedit.js rename to FacewhatML5/app/scripts/layui/lay/modules/layedit.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/layer.js b/FacewhatML5/app/scripts/layui/lay/modules/layer.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/layer.js rename to FacewhatML5/app/scripts/layui/lay/modules/layer.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/laypage.js b/FacewhatML5/app/scripts/layui/lay/modules/laypage.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/laypage.js rename to FacewhatML5/app/scripts/layui/lay/modules/laypage.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/laytpl.js b/FacewhatML5/app/scripts/layui/lay/modules/laytpl.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/laytpl.js rename to FacewhatML5/app/scripts/layui/lay/modules/laytpl.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/mobile.js b/FacewhatML5/app/scripts/layui/lay/modules/mobile.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/mobile.js rename to FacewhatML5/app/scripts/layui/lay/modules/mobile.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/tree.js b/FacewhatML5/app/scripts/layui/lay/modules/tree.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/tree.js rename to FacewhatML5/app/scripts/layui/lay/modules/tree.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/upload.js b/FacewhatML5/app/scripts/layui/lay/modules/upload.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/upload.js rename to FacewhatML5/app/scripts/layui/lay/modules/upload.js diff --git a/FacewhatML5/WebRoot/scripts/layui/lay/modules/util.js b/FacewhatML5/app/scripts/layui/lay/modules/util.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/lay/modules/util.js rename to FacewhatML5/app/scripts/layui/lay/modules/util.js diff --git a/FacewhatML5/WebRoot/scripts/layui/layui.js b/FacewhatML5/app/scripts/layui/layui.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/layui/layui.js rename to FacewhatML5/app/scripts/layui/layui.js diff --git a/FacewhatML5/WebRoot/scripts/mtree/Mtree.html b/FacewhatML5/app/scripts/mtree/Mtree.html similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/Mtree.html rename to FacewhatML5/app/scripts/mtree/Mtree.html diff --git a/FacewhatML5/WebRoot/scripts/mtree/css/mtree.css b/FacewhatML5/app/scripts/mtree/css/mtree.css similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/css/mtree.css rename to FacewhatML5/app/scripts/mtree/css/mtree.css diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/4.bmp b/FacewhatML5/app/scripts/mtree/img/4.bmp similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/4.bmp rename to FacewhatML5/app/scripts/mtree/img/4.bmp diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/L0.gif b/FacewhatML5/app/scripts/mtree/img/L0.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/L0.gif rename to FacewhatML5/app/scripts/mtree/img/L0.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/L1.gif b/FacewhatML5/app/scripts/mtree/img/L1.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/L1.gif rename to FacewhatML5/app/scripts/mtree/img/L1.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/L2.gif b/FacewhatML5/app/scripts/mtree/img/L2.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/L2.gif rename to FacewhatML5/app/scripts/mtree/img/L2.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/L3.gif b/FacewhatML5/app/scripts/mtree/img/L3.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/L3.gif rename to FacewhatML5/app/scripts/mtree/img/L3.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/L4.gif b/FacewhatML5/app/scripts/mtree/img/L4.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/L4.gif rename to FacewhatML5/app/scripts/mtree/img/L4.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/L5.gif b/FacewhatML5/app/scripts/mtree/img/L5.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/L5.gif rename to FacewhatML5/app/scripts/mtree/img/L5.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/M0.gif b/FacewhatML5/app/scripts/mtree/img/M0.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/M0.gif rename to FacewhatML5/app/scripts/mtree/img/M0.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/M1.gif b/FacewhatML5/app/scripts/mtree/img/M1.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/M1.gif rename to FacewhatML5/app/scripts/mtree/img/M1.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/M2.gif b/FacewhatML5/app/scripts/mtree/img/M2.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/M2.gif rename to FacewhatML5/app/scripts/mtree/img/M2.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/M3.gif b/FacewhatML5/app/scripts/mtree/img/M3.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/M3.gif rename to FacewhatML5/app/scripts/mtree/img/M3.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/P0.gif b/FacewhatML5/app/scripts/mtree/img/P0.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/P0.gif rename to FacewhatML5/app/scripts/mtree/img/P0.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/P1.gif b/FacewhatML5/app/scripts/mtree/img/P1.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/P1.gif rename to FacewhatML5/app/scripts/mtree/img/P1.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/P2.gif b/FacewhatML5/app/scripts/mtree/img/P2.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/P2.gif rename to FacewhatML5/app/scripts/mtree/img/P2.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/P3.gif b/FacewhatML5/app/scripts/mtree/img/P3.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/P3.gif rename to FacewhatML5/app/scripts/mtree/img/P3.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/co.png b/FacewhatML5/app/scripts/mtree/img/co.png similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/co.png rename to FacewhatML5/app/scripts/mtree/img/co.png diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/company.png b/FacewhatML5/app/scripts/mtree/img/company.png similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/company.png rename to FacewhatML5/app/scripts/mtree/img/company.png diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/department.png b/FacewhatML5/app/scripts/mtree/img/department.png similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/department.png rename to FacewhatML5/app/scripts/mtree/img/department.png diff --git a/FacewhatML5/WebRoot/scripts/mtree/img/t.gif b/FacewhatML5/app/scripts/mtree/img/t.gif similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/img/t.gif rename to FacewhatML5/app/scripts/mtree/img/t.gif diff --git a/FacewhatML5/WebRoot/scripts/mtree/js/MzTreeView.js b/FacewhatML5/app/scripts/mtree/js/MzTreeView.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/mtree/js/MzTreeView.js rename to FacewhatML5/app/scripts/mtree/js/MzTreeView.js diff --git a/FacewhatML5/WebRoot/scripts/strophe/strophe.disco.js b/FacewhatML5/app/scripts/strophe/strophe.disco.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/strophe/strophe.disco.js rename to FacewhatML5/app/scripts/strophe/strophe.disco.js diff --git a/FacewhatML5/WebRoot/scripts/strophe/strophe.ibb.js b/FacewhatML5/app/scripts/strophe/strophe.ibb.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/strophe/strophe.ibb.js rename to FacewhatML5/app/scripts/strophe/strophe.ibb.js diff --git a/FacewhatML5/WebRoot/scripts/strophe/strophe.js b/FacewhatML5/app/scripts/strophe/strophe.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/strophe/strophe.js rename to FacewhatML5/app/scripts/strophe/strophe.js diff --git a/FacewhatML5/WebRoot/scripts/strophe/strophe.muc.js b/FacewhatML5/app/scripts/strophe/strophe.muc.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/strophe/strophe.muc.js rename to FacewhatML5/app/scripts/strophe/strophe.muc.js diff --git a/FacewhatML5/WebRoot/scripts/strophe/strophe.si-filetransfer.js b/FacewhatML5/app/scripts/strophe/strophe.si-filetransfer.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/strophe/strophe.si-filetransfer.js rename to FacewhatML5/app/scripts/strophe/strophe.si-filetransfer.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.chat.js b/FacewhatML5/app/scripts/xow/xow.chat.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.chat.js rename to FacewhatML5/app/scripts/xow/xow.chat.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.connection.js b/FacewhatML5/app/scripts/xow/xow.connection.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.connection.js rename to FacewhatML5/app/scripts/xow/xow.connection.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.handler.js b/FacewhatML5/app/scripts/xow/xow.handler.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.handler.js rename to FacewhatML5/app/scripts/xow/xow.handler.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.messagearchive.js b/FacewhatML5/app/scripts/xow/xow.messagearchive.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.messagearchive.js rename to FacewhatML5/app/scripts/xow/xow.messagearchive.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.messagecenter.js b/FacewhatML5/app/scripts/xow/xow.messagecenter.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.messagecenter.js rename to FacewhatML5/app/scripts/xow/xow.messagecenter.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.model.js b/FacewhatML5/app/scripts/xow/xow.model.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.model.js rename to FacewhatML5/app/scripts/xow/xow.model.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.orgnization.js b/FacewhatML5/app/scripts/xow/xow.orgnization.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.orgnization.js rename to FacewhatML5/app/scripts/xow/xow.orgnization.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.presence.js b/FacewhatML5/app/scripts/xow/xow.presence.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.presence.js rename to FacewhatML5/app/scripts/xow/xow.presence.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.room.js b/FacewhatML5/app/scripts/xow/xow.room.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.room.js rename to FacewhatML5/app/scripts/xow/xow.room.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.roster.js b/FacewhatML5/app/scripts/xow/xow.roster.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.roster.js rename to FacewhatML5/app/scripts/xow/xow.roster.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.server.js b/FacewhatML5/app/scripts/xow/xow.server.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.server.js rename to FacewhatML5/app/scripts/xow/xow.server.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.user.js b/FacewhatML5/app/scripts/xow/xow.user.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.user.js rename to FacewhatML5/app/scripts/xow/xow.user.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.vcard.js b/FacewhatML5/app/scripts/xow/xow.vcard.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.vcard.js rename to FacewhatML5/app/scripts/xow/xow.vcard.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xow.view.js b/FacewhatML5/app/scripts/xow/xow.view.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xow.view.js rename to FacewhatML5/app/scripts/xow/xow.view.js diff --git a/FacewhatML5/app/scripts/xow/xowim2.js b/FacewhatML5/app/scripts/xow/xowim2.js new file mode 100644 index 0000000..bbd5e78 --- /dev/null +++ b/FacewhatML5/app/scripts/xow/xowim2.js @@ -0,0 +1,338 @@ +(function (factory) { + // 暂时不用amd那个东西，因为还不知道那个的具体用处 + window.XoW = factory(Strophe); +}(function (Strophe) { + var XoW; + XoW = { + VERSION: "1.0", + // 命名空间 + NS: { + PING: "urn:xmpp:ping", + VCARD: "vcard-temp", + USER_SERACH: "jabber:iq:search", + FORM_DATA: "jabber:x:data", + ARCHIVE: "urn:xmpp:archive", + FW_ORGNIZATION: 'http://facewhat.com/orgnization', + }, + // 节类型 + StanzaType: { + SET: "set", + GET: "get", + RESULT: "result", + ERROR: "error" + }, + }; + return XoW; +})); + + +(function (factory) { + return factory(XoW); +}(function (XoW) { + + /** + * + * @param options 参数 + * loginStateAId + * 用来显示登录状态的A标签的id。 + */ + XoW.GlobalManager = function () { + + this._connMgr = null; + this._viewMgr = null; + this._rosterMgr = null; + this._userMgr = null; + this._vcardMgr = null; + this._presenceMgr = null; + this._chatMgr = null; + this._roomMgr = null; + this._messageArchiveMgr = null; + this._orgnizationMgr = null; + this._serverMgr = null; // 服务器管理对象 + this._currentUser = null; // 当前登录用户 + this._currentUserJid = ''; // 当前用户jid + this._currentUserPwd = ""; // 当前登录用户密码 + + // 用于打日志的时候显示是该类内部的方法调用的打日志。 + this.classInfo = "【GlobalManager】"; + + this._init(); + }; + + XoW.GlobalManager.prototype = { + /** + * 初始化方法，做一些初始化 + */ + _init: function () { + XoW.logger.ms(this.classInfo + "_init()"); + + // 新建连接管理对象 + this._connMgr = new XoW.ConnectionManager(this); + + // 将登录结果的回调函数放入其中 + this._connMgr.addHandlerToConnMgr('loginCb', this._connectCb.bind(this)); + + + // 新建界面管理对象 + this._viewMgr = new XoW.ViewManager(this); + + + XoW.logger.me(this.classInfo + "_init()"); + }, + + /** + * 得到各种管理对象。这种方式就和OPenfire提供了很多单例类类似。。 + * 这种方式和老师说的以命令的方式，谁比较好？ + * 感觉使用命令方式，调用者会不会很困惑？ + * 命令模式开放的接口是： + * get(params) ? + * 还是比如获取各种Manager的时候就是 + * getManager(params) ? + * + */ + /** + * 现在的控制权在strophe中 。如果我想要控制所有节的走向 + * 那么。就不能使用strophe的扩展插件了。 + */ + getConnMgr: function () { + XoW.logger.d(this.classInfo + "获取了_connMgr 对象"); + return this._connMgr; + }, + getUserMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _userMgr 对象"); + return this._userMgr; + }, + getRosterMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _rosterMgr 对象"); + return this._rosterMgr; + }, + getViewMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _viewMgr 对象"); + return this._viewMgr; + }, + getVcardMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _vcardMgr 对象"); + return this._vcardMgr; + }, + getPresenceMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _presenceMgr 对象"); + return this._presenceMgr; + }, + getChatMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _chatMgr 对象"); + return this._chatMgr; + }, + getRoomMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _roomMgr 对象"); + return this._roomMgr; + }, + getServerMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _serverMgr 对象"); + return this._serverMgr; + }, + getCurrentUser: function () { + XoW.logger.d(this.classInfo + "获取了 _currentUser 对象"); + return this._currentUser; + }, + // 返回当前服务器名称，这个方法有点不妥。 +// getCurrentServer : function() { +// XoW.logger.d(this.classInfo + "getCurrentServer"); +// return XoW.utils.getDomainFromJid(this._currentUser.getJid()); +// }, + getMessageArchiveMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _messageArchiveMgr 对象"); + return this._messageArchiveMgr; + }, + + getOrgnizationMgr: function () { + XoW.logger.d(this.classInfo + "获取了 _orgnizationMgr 对象"); + return this._orgnizationMgr; + }, + + /** + * 新建XoW.Connection对象并开始连接 + * @param serviceURL 服务器URL + * @param username 用户名，不包含后面的ip等 + * @param pass 密码 + */ + connect: function (serviceURL, username, pass) { + XoW.logger.ms(this.classInfo + "connect()"); + XoW.logger.p({"serviceURL": serviceURL, "username": username, "pass": pass}); + + // 得到jid + this._currentUserJid = username + "@" + XoW.utils.getIPFromURL(serviceURL); + // this._currentUser.setJid(jid); + this._currentUserPwd = pass; + + + // 开始连接 _currentUserJid + this._connMgr.connect(serviceURL, this._currentUserJid, this._currentUserPwd); + this._connMgr.addHandler(function (stanza) { + XoW.logger.d("open-->" + Strophe.serialize(stanza)); + }, null, 'open'); + + + XoW.logger.me(this.classInfo + "connect()"); + }, + /** + * 登录结果回调 + * @param params 包含 + * success{boolean} 登录成功返回true，其他返回false + * msg 登录结果消息 + * cond 登录结果代码，参考Strophe的登录结果代码 + */ + _connectCb: function (params) { + var success = params.success; + var msg = params.msg; + var cond = params.cond; + + XoW.logger.ms(this.classInfo + "_connectCb()"); + XoW.logger.p({"success": success, "msg": msg, cond: cond}); + + if (success) { // 登录成功 + XoW.logger.i(this.classInfo + "登录成功"); + + // 初始化一些登录之后才要/才能初始化的管理器 + this._initManager(); + // 做一些动作 + this._actions(); + + + } else { + XoW.logger.i(this.classInfo + "登录失败"); + } + + XoW.logger.me(this.classInfo + "_connectCb()"); + return true; + }, + + /** + * 登录成功后才初始化的一些Manager + */ + _initManager: function () { + XoW.logger.ms(this.classInfo + "_initManager()"); + + // 新建聊天管理对象 + this._chatMgr = new XoW.ChatManager(this); + + // 新建好友管理对象 + this._userMgr = new XoW.UserManager(this); + + // 新建房间管理对象 + this._roomMgr = new XoW.RoomManager(this); + + // 历史消息管理对象 + this._messageArchiveMgr = new XoW.MessageArchiveManager(this); + + // 组织结构树管理对象 + this._orgnizationMgr = new XoW.OrgnizationManager(this); + + // 在初始化userMgr之后就要调用这个，这个应该是界面来监听的。。 + this._viewMgr._afterInitUserMgr(); + + // 当前登录用户 + this._currentUser = new XoW.User(this._userMgr); + //this._currentUser.setJid(); + // 设置状态为在线。1是在线，因为刚开始登录的时候，有收不到自己出席的节的时候。 + this._currentUser.setState(1); + + + // this._currentUser.setUserMgr(this._userMgr); + + // 初始化会议室聊天管理 + // this._roomMgr = new XoW.RoomManager(this); + + // 当前用户的出席节监听 + //this._presenceMgr.addPresenceHandler(this._presence_cb.bind(this)); + + // 新建花名册管理对象 + //this._rosterMgr = new XoW.RosterManager(this); + + + XoW.logger.me(this.classInfo + "_initManager()"); + }, + /** + * 各种动作，请求好友列表，发送出席节等 + */ + _actions: function () { + XoW.logger.ms(this.classInfo + "_actions()"); + + // var userJid = this.getCurrentUser().getJid(); + // var ip = XoW.utils.getIPFromURL(userJid); + + + // 此时才开始请求好友列表 + this._currentUser.getRosterFromServer(function (params1) { + XoW.logger.d(this.classInfo + "请求roster完成"); + // 此时开始请求用户的个人vcard + this._currentUser.getVcardFromServer(function (params2) { + XoW.logger.d(this.classInfo + "请求vcard完成"); +// var params = { +// vcard : vcardTemp , +// vcardStanza : stanza, +// }; + // 因为刚开始未初始化 currentUser中的数据，所以jid,res + // 这些东西都为空。所以无法在presence中做（presence要比对from==jid）， + // 还有另外一个原因就是感觉有时候没能够收到自己的presence + // 而且请求vcard也在发送presence之前。 + var $vStanza = $(params2.vcardStanza); + var jid = $vStanza.attr('to'); + var pureJid = XoW.utils.getBareJidFromJid(jid); + var res = XoW.utils.getResourceFromJid(jid); + // 设置用户的纯jid + this._currentUser.setJid(pureJid); + this._currentUser.setResource(res); + + // 在内部已经有setVcard和setFace的操作了 + // this._currentUser.setVcard(params.vcard); + // this._currentUser.setFace(params.vcard.PHOTO.BINVAL); + + + // 在这里获得服务器的一些信息。 + // 先用jid的node来做name，后面可能用到vcard里面的name + // this._currentUser.setName(XoW.utils.getNodeFromJid(this._currentUser.getJid())); + // 在这里一定可以保证 当前用户已经是 node@domain/resource而不是 node@ip ？ + + // 新建服务管理的对象 + // 请求服务这个用到了 用户的域（node@domain/res)所以，要在 + // 上面该用户设置完pureJid后才能初始化。因为这个服务对象一初始化 + // 就会请求服务器。 + this._serverMgr = new XoW.ServerMananger(this); + // 此处请求所有的会议室，会议室管理对象是依赖服务管理对象 + // 因为只有存在 会议服务之后，才存在会议室管理服务。 + + + // 第一个出席节的发送至关重要，因为它告诉服务器“我”上线了，然后服务器会把： + // 所以一定要在这之前把一些该做的事做完，比如加载好友列表，加好一些监听器。 + // 1,好友的出席情况发给我， + // 2,离线消息发给我 + // 3,还有其他的一些 东西，比如 有人加我为好友。 + setTimeout(function () { + + XoW.logger.d(this.classInfo + "发送出席节"); + // 发送出席 + this._currentUser.sendOnline(); + // 请求房间列表 + // this._roomMgr.getAllRoomsFromServer(); + + /*this._viewMgr._showOrganization();*/ + this._orgnizationMgr._start(); // 启动。 + this._roomMgr._start(); // 启动 + }.bind(this), 1000); + + }.bind(this), function (errorStanza) { + alert("获取用户vcard失败！"); + }); + }.bind(this), function (errorStanza) { + alert("获取好友列表失败！"); + }); + + + }, + + + }; + return XoW; +})); + + diff --git a/FacewhatML5/WebRoot/scripts/xow/xowlogger.js b/FacewhatML5/app/scripts/xow/xowlogger.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xowlogger.js rename to FacewhatML5/app/scripts/xow/xowlogger.js diff --git a/FacewhatML5/WebRoot/scripts/xow/xowutils.js b/FacewhatML5/app/scripts/xow/xowutils.js similarity index 100% rename from FacewhatML5/WebRoot/scripts/xow/xowutils.js rename to FacewhatML5/app/scripts/xow/xowutils.js diff --git a/FacewhatML5/WebRoot/skin/default/textbg.png b/FacewhatML5/app/skin/default/textbg.png similarity index 100% rename from FacewhatML5/WebRoot/skin/default/textbg.png rename to FacewhatML5/app/skin/default/textbg.png diff --git a/FacewhatML5/WebRoot/skin/default/xubox_ico0.png b/FacewhatML5/app/skin/default/xubox_ico0.png similarity index 100% rename from FacewhatML5/WebRoot/skin/default/xubox_ico0.png rename to FacewhatML5/app/skin/default/xubox_ico0.png diff --git a/FacewhatML5/WebRoot/skin/default/xubox_loading0.gif b/FacewhatML5/app/skin/default/xubox_loading0.gif similarity index 100% rename from FacewhatML5/WebRoot/skin/default/xubox_loading0.gif rename to FacewhatML5/app/skin/default/xubox_loading0.gif diff --git a/FacewhatML5/WebRoot/skin/default/xubox_loading1.gif b/FacewhatML5/app/skin/default/xubox_loading1.gif similarity index 100% rename from FacewhatML5/WebRoot/skin/default/xubox_loading1.gif rename to FacewhatML5/app/skin/default/xubox_loading1.gif diff --git a/FacewhatML5/WebRoot/skin/default/xubox_loading2.gif b/FacewhatML5/app/skin/default/xubox_loading2.gif similarity index 100% rename from FacewhatML5/WebRoot/skin/default/xubox_loading2.gif rename to FacewhatML5/app/skin/default/xubox_loading2.gif diff --git a/FacewhatML5/WebRoot/skin/default/xubox_loading3.gif b/FacewhatML5/app/skin/default/xubox_loading3.gif similarity index 100% rename from FacewhatML5/WebRoot/skin/default/xubox_loading3.gif rename to FacewhatML5/app/skin/default/xubox_loading3.gif diff --git a/FacewhatML5/WebRoot/skin/default/xubox_title0.png b/FacewhatML5/app/skin/default/xubox_title0.png similarity index 100% rename from FacewhatML5/WebRoot/skin/default/xubox_title0.png rename to FacewhatML5/app/skin/default/xubox_title0.png diff --git a/FacewhatML5/WebRoot/skin/layer.css b/FacewhatML5/app/skin/layer.css similarity index 100% rename from FacewhatML5/WebRoot/skin/layer.css rename to FacewhatML5/app/skin/layer.css diff --git a/FacewhatML5/WebRoot/skin/layer.ext.css b/FacewhatML5/app/skin/layer.ext.css similarity index 100% rename from FacewhatML5/WebRoot/skin/layer.ext.css rename to FacewhatML5/app/skin/layer.ext.css diff --git a/FacewhatML5/gulpfile.js b/FacewhatML5/gulpfile.js new file mode 100644 index 0000000..d6ab8e0 --- /dev/null +++ b/FacewhatML5/gulpfile.js @@ -0,0 +1,134 @@ +/** + * Created by Administrator on 2017/9/4. + * html压缩替换未实现，请参考http://www.jb51.net/article/100652.htm + * 暂时学习这些用法，未进行打包之类 + */ +// 引入gulp +var gulp = require('gulp'); + +// 引入组件 +var jshint = require('gulp-jshint'); // 代码检查 +//var sass = require('gulp-sass'); // sass编译 +var less = require('gulp-less'); // less编译 +var concat = require('gulp-concat'); // 代码合并 +var uglify = require('gulp-uglify'); // 代码压缩 +var rename = require('gulp-rename'); // 文件重命名 +var cssmin = require('gulp-minify-css'); //css压缩 +var clean = require('gulp-clean'); // 清理 +var connect = require('gulp-connect'); // web服务器 + +//定义css、js源文件路径 +var jsSrc = 'app/js/*.js', + jsDist = 'dist/js', + cssSrc = 'app/css/*.css', + lessSrc = 'less/*.less', + sassSrc = './scss/*.scss', + cssDist = './dist/css', + imgMinSrc = 'dist/images/*.{png,jpg,gif,ico}', + htmlSrc = '*.html'; + +// 检查脚本，在命令行使用 gulp script 启动此任务（script为task名） +gulp.task('lint', function(){ + gulp.src(jsSrc) + .pipe(jshint()); +}); + +// 压缩 js 文件 +gulp.task('scripts', function() { + // 1\. 找到文件 + gulp.src(jsSrc) + .pipe(concat('all.js')) + .pipe(gulp.dest(jsDist)) + .pipe(rename('all.min.js')) + .pipe(uglify()) // 压缩文件 + .pipe(gulp.dest(jsDist)) +}); + +// 编译Sass +//gulp.task('sass', function() { +// gulp.src(sassSrc) +// .pipe(sass()) +// .pipe(gulp.dest(cssDist)); +//}); + +// 编译less +gulp.task('less', function(){ + return gulp.src(lessSrc) + .pipe(less()) // 参数为空，编译为css + .pipe(gulp.dest(cssDist)) // 另存为文件 + .pipe(cssmin()) // 压缩css + .pipe(gulp.dest(cssDist)); +}); + +//当所有less文件发生改变时，调用testLess任务 +gulp.task('watchLess', function () { + gulp.watch(lessSrc, ['less']); +}); + +// 压缩css文件 +gulp.task('minCss', function(){ + gulp.src(cssSrc) + .pipe(cssmin()) // 压缩css + .pipe(gulp.dest(cssDist)); +}); + +// 监听css文件，当src/css/下所有css文件发生改变时，调用minCss任务 +gulp.task('watchCss', function () { + gulp.watch(cssSrc, ['minCss']); +}); + +// 在命令行使用 gulp auto 启动此任务 +gulp.task('watchJs', function () { + // 监听文件修改，当文件被修改则执行 script 任务 + gulp.watch('js/*.js', ['scripts']) + //.watch('less/*.less', ['less']) +}) + +gulp.task('copy', function() { + return gulp.src('app/**/*') + .pipe(gulp.dest('dist')) +}); + +gulp.task('clean', function(){ + return gulp.src('./dist/') + .pipe(clean()); +}); + +// 使用 gulp.task('default') 定义默认任务 +// 在命令行使用 gulp 启动 script 任务和 auto 任务 +// gulp.task('default', ['lint', 'less', 'scripts','watchCss'/*, 'auto'*/]) +// 先执行clean再执行其他 +//gulp.task('default', ['clean'], function(){ +// gulp.start('lint', 'less', 'scripts','watchCss'); +//}); + +/******************************************************************* +* 以上暂时不用等功能完成后用以打包 + * * +********************************************************************/ + +// 自动刷新浏览器 +gulp.task('watcher',function(){ + gulp.watch('./app/**/*.*',['loadfiles']); +}); + +// 启动服务器 +gulp.task('startServer',function(){ + connect.server({ + root:'app', + ip:'10.10.123.5s', + port:8888, + livereload:true + }); +}); + +gulp.task('stopServer',function(){ + connect.serverClose(); +}); + +gulp.task('loadfiles', function(){ + gulp.src('./app/**/*.*') + .pipe(connect.reload()); +}); + +gulp.task('default',['startServer','watcher']) \ No newline at end of file diff --git a/FacewhatML5/package.json b/FacewhatML5/package.json new file mode 100644 index 0000000..83033f8 --- /dev/null +++ b/FacewhatML5/package.json @@ -0,0 +1,16 @@ +{ + "name": "FacewhatMl5", + "version": "1.0.0", + "dependencies": {}, + "devDependencies": { + "cssmin": "^0.4.3", + "gulp": "^3.9.1", + "gulp-clean": "^0.3.2", + "gulp-connect": "^5.0.0", + "gulp-less": "^3.3.2", + "gulp-minify-css": "^1.2.4", + "gulp-sass": "^3.1.0", + "gulp-watch": "^4.3.11", + "require-dir": "^0.3.2" + } +}