diff --git a/inc/catc.php b/inc/catc.php index 4b977e6..4e5986a 100644 --- a/inc/catc.php +++ b/inc/catc.php @@ -88,7 +88,8 @@ class CATC extends Main 'context' => $this->asContext, 'cookie' => Auth::USER_COOKIE_PASS, 'workshops' => (new Course($this->oDb))->getWorkshops(), - 'courses' => (new Course($this->oDb))->getCourses() + 'courses' => (new Course($this->oDb))->getCourses(), + 'server' => Settings::SERVER_URL ), 'vars' => $this->getVars() ), diff --git a/masks/template.html b/masks/template.html index ace6f14..c98684d 100644 --- a/masks/template.html +++ b/masks/template.html @@ -14,7 +14,7 @@ - + diff --git a/scripts/catc.js b/scripts/catc.js index 5b87f77..c4d5346 100644 --- a/scripts/catc.js +++ b/scripts/catc.js @@ -193,15 +193,22 @@ function CATC(asGlobals) }); //Sync - self.elem.$Menu.find('.sync').click(function(){ - Tools.ajax( - 'server_push', - ()=>{self.feedback('success', 'Successful Sync');}, - {}, - (sDesc)=>{self.feedback('error', sDesc);}, - $(this).find('i') - ); - }); + var $Sync = self.elem.$Menu.find('.sync'); + if(self.consts.server!='') { + $Sync + .attr('title', 'Sync local server with '+getHostname(self.consts.server)) + .tooltip() + .click(function(){ + Tools.ajax( + 'server_push', + ()=>{self.feedback('success', 'Successful Sync');}, + {}, + (sDesc)=>{self.feedback('error', sDesc);}, + $(this).find('i') + ); + }); + } + else $Sync.hide(); //Home self.elem.$Menu.find('.home').click(function(){self.setHash(self.consts.default_page);}); diff --git a/scripts/common.js b/scripts/common.js index de567bc..bf55843 100644 --- a/scripts/common.js +++ b/scripts/common.js @@ -285,6 +285,22 @@ function getLoginToken(sPass) return md5(sPass+window.location.origin+window.location.pathname); } +function getHostname(url) { + var hostname; + + //find & remove protocol (http, ftp, etc.) and get hostname + if(url.indexOf("//") > -1) hostname = url.split('/')[2]; + else hostname = url.split('/')[0]; + + //find & remove port number + hostname = hostname.split(':')[0]; + + //find & remove "?" + hostname = hostname.split('?')[0]; + + return hostname; +} + var defaultDiacriticsRemovalap = [ {'base':'A', 'letters':'\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F'}, {'base':'AA','letters':'\uA732'},