summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-11-24 16:49:37 +0100
committerGitHub <noreply@github.com>2016-11-24 16:49:37 +0100
commit98891751bfd2f0120555170dd52c4962925e7821 (patch)
treeeccb6b34698ee415465ba88575dea61becd82196 /core
parentb394151d1c005931c869ac22cfb7bcdab436e9fe (diff)
parente75dede5905c3c796ca1c9d71e3ff61facf4ba56 (diff)
downloadnextcloud-server-98891751bfd2f0120555170dd52c4962925e7821.tar.gz
nextcloud-server-98891751bfd2f0120555170dd52c4962925e7821.zip
Merge pull request #2313 from nextcloud/fix-naming
fix some outdated naming
Diffstat (limited to 'core')
-rw-r--r--core/css/header.css8
-rw-r--r--core/js/js.js18
-rw-r--r--core/templates/layout.user.php2
3 files changed, 14 insertions, 14 deletions
diff --git a/core/css/header.css b/core/css/header.css
index 19ecf77bcd3..f81a71070f0 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -46,7 +46,7 @@
/* LOGO and APP NAME -------------------------------------------------------- */
-#owncloud {
+#nextcloud {
position: absolute;
top: 0;
left: 0;
@@ -57,12 +57,12 @@
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
opacity: 1;
}
-#owncloud:focus {
+#nextcloud:focus {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)";
opacity: .75;
}
-#owncloud:hover,
-#owncloud:active {
+#nextcloud:hover,
+#nextcloud:active {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
opacity: 1;
}
diff --git a/core/js/js.js b/core/js/js.js
index 714529fe5d1..b8535518f02 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -69,8 +69,8 @@ var OCP = {},
TAG_FAVORITE: '_$!<Favorite>!$_',
/* jshint camelcase: false */
/**
- * Relative path to ownCloud root.
- * For example: "/owncloud"
+ * Relative path to Nextcloud root.
+ * For example: "/nextcloud"
*
* @type string
*
@@ -240,7 +240,7 @@ var OCP = {},
},
/**
- * Protocol that is used to access this ownCloud instance
+ * Protocol that is used to access this Nextcloud instance
* @return {string} Used protocol
*/
getProtocol: function() {
@@ -248,7 +248,7 @@ var OCP = {},
},
/**
- * Returns the host used to access this ownCloud instance
+ * Returns the host used to access this Nextcloud instance
* Host is sometimes the same as the hostname but now always.
*
* Examples:
@@ -265,7 +265,7 @@ var OCP = {},
},
/**
- * Returns the hostname used to access this ownCloud instance
+ * Returns the hostname used to access this Nextcloud instance
* The hostname is always stripped of the port
*
* @return {string} hostname
@@ -276,7 +276,7 @@ var OCP = {},
},
/**
- * Returns the port number used to access this ownCloud instance
+ * Returns the port number used to access this Nextcloud instance
*
* @return {int} port number
*
@@ -287,9 +287,9 @@ var OCP = {},
},
/**
- * Returns the web root path where this ownCloud instance
+ * Returns the web root path where this Nextcloud instance
* is accessible, with a leading slash.
- * For example "/owncloud".
+ * For example "/nextcloud".
*
* @return {string} web root path
*
@@ -1404,7 +1404,7 @@ function initCore() {
// move triangle of apps dropdown to align with app name triangle
// 2 is the additional offset between the triangles
if($('#navigation').length) {
- $('#header #owncloud + .menutoggle').one('click', function(){
+ $('#header #nextcloud + .menutoggle').one('click', function(){
var caretPosition = $('.header-appname + .icon-caret').offset().left - 2;
if(caretPosition > 255) {
// if the app name is longer than the menu, just put the triangle in the middle
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 1d0ac5fa146..2db333c1977 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -43,7 +43,7 @@
</div>
<header role="banner"><div id="header">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
- id="owncloud" tabindex="1">
+ id="nextcloud" tabindex="1">
<div class="logo-icon">
<h1 class="hidden-visually">
<?php p($theme->getName()); ?>