Merge branch 'cernbox-develop-8.0.2-doc' into cernbox-prod-8.0.2

cernbox · Sep 11, 2015 · 73faca5 · 73faca5
2 parents 1866ddc + b3befdb
commit 73faca5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
@@ -61,7 +61,7 @@
 				</h1>
 				<div class="icon-caret svg"></div>
 			</a>
-			<a target="_blank" href="https://cern.ch/cernbox-resources" tabindex="2" style="display:inline-block; position:absolute; margin-left: 140px; height: 27px; padding-top: 18px">
+			<a target="_blank" href="https://cernbox.cern.ch/cernbox/doc" tabindex="2" style="display:inline-block; position:absolute; margin-left: 140px; height: 27px; padding-top: 18px">
 				<h1 class="header-appname" style="color: #C6CAD0;">
 				Help & Download Clients
 				</h1>

diff --git a/lib/private/defaults.php b/lib/private/defaults.php
@@ -31,13 +31,13 @@ function __construct() {
 		$this->defaultName = 'CERNBox'; /* short name, used when referring to the software */
 		$this->defaultTitle = 'CERNBox'; /* can be a longer name, for titles */
 		$this->defaultBaseUrl = 'https://cernbox.cern.ch';
-		$this->defaultSyncClientUrl = 'http://cern.ch/cernbox-resources';
-		$this->defaultiOSClientUrl = 'https://cern.ch/cernbox-resources';
+		$this->defaultSyncClientUrl = 'http://cernbox.cern.ch/cernbox/doc';
+		$this->defaultiOSClientUrl = 'https://cernbox.cern.ch/cernbox/doc';
 		$this->defaultiTunesAppId = '543672169';
 		$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=ch.cern.cernbox';
 		$this->defaultDocBaseUrl = 'http://doc.owncloud.org';
 		$this->defaultDocVersion = $version[0] . '.0'; // used to generate doc links
-		$this->defaultSlogan = $this->l->t('CERN storage under your control');
+		$this->defaultSlogan = $this->l->t('<a href="http://cernbox.cern.ch/cernbox/doc">Help and Download Clients</a>');
 		$this->defaultLogoClaim = '';
 		$this->defaultMailHeaderColor = '#fff'; /* header color of mail notifications */
 

diff --git a/lib/private/user/session.php b/lib/private/user/session.php
@@ -217,7 +217,7 @@ public function login($uid, $password) {
 					if($uidAndGid === false) {
 						\OCP\Util::writeLog('EOSLOGIN', "user: $uid has not a valid uid", \OCP\Util::ERROR);
 			                        $tmpl = new \OC_Template('', 'error', 'guest');
-			                        $tmpl->assign('errors', array(1 => array('error' => "Your account has no computing group assigned. <br> Please use the CERN Account Service to fix this.  You may also check out <a href=\"http://cern.ch/cernbox-resources/faq.html\">CERNBOX FAQ</a> for additional information. <br> If the problem persists then please report it via CERN Service Portal.")));
+			                        $tmpl->assign('errors', array(1 => array('error' => "Your account has no computing group assigned. <br> Please use the CERN Account Service to fix this.  You may also check out <a href=\"http://cern.ch/cernbox/doc/faq.html\">CERNBOX FAQ</a> for additional information. <br> If the problem persists then please report it via CERN Service Portal.")));
 			                        $tmpl->printPage();
 			                        \OCP\User::logout();
 			                        exit();