From f2320190b8985b3b38c9527b970476a58e7ffb09 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 17 Jul 2017 17:18:28 +0200 Subject: [PATCH] change friends url to /contacts/ --- customize.dist/pages.js | 2 +- customize.dist/src/less/toolbar.less | 2 +- customize.dist/template.js | 6 +++--- www/{friends => contacts}/index.html | 0 www/{friends => contacts}/inner.html | 2 +- www/{friends => contacts}/inner.js | 2 +- www/{friends => contacts}/main.js | 0 www/{friends => contacts}/main.less | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename www/{friends => contacts}/index.html (100%) rename www/{friends => contacts}/inner.html (75%) rename www/{friends => contacts}/inner.js (93%) rename www/{friends => contacts}/main.js (100%) rename www/{friends => contacts}/main.less (100%) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index a62c962fb..6fac30280 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -481,7 +481,7 @@ define([ return loadingScreen(); }; - Pages['/friends/'] = Pages['/friends/index.html'] = function () { + Pages['/contacts/'] = Pages['/contacts/index.html'] = function () { return loadingScreen(); }; diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less index 2b3135848..3e0458dae 100644 --- a/customize.dist/src/less/toolbar.less +++ b/customize.dist/src/less/toolbar.less @@ -265,7 +265,7 @@ body { @color: @toolbar-file-color; .addToolbarColors(@color, @bgcolor); } - &.app-friends { + &.app-contacts { @bgcolor: @toolbar-friends-bg; @color: @toolbar-friends-color; .addToolbarColors(@color, @bgcolor); diff --git a/customize.dist/template.js b/customize.dist/template.js index ca0fb7bd3..7fc7172ce 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -12,7 +12,7 @@ $(function () { var Messages = Cryptpad.Messages; var $body = $('body'); var isMainApp = function () { - return /^\/(pad|code|slide|poll|whiteboard|file|media|friends|drive|settings|profile)\/$/.test(location.pathname); + return /^\/(pad|code|slide|poll|whiteboard|file|media|contacts|drive|settings|profile)\/$/.test(location.pathname); }; var rightLink = function (ref, loc, txt) { @@ -148,9 +148,9 @@ $(function () { } else if (/\/file\//.test(pathname)) { $('body').append(h('body', Pages[pathname]()).innerHTML); require([ '/file/main.js' ], ready); - } else if (/friends/.test(pathname)) { + } else if (/contacts/.test(pathname)) { $('body').append(h('body', Pages[pathname]()).innerHTML); - require([ '/friends/main.js' ], ready); + require([ '/contacts/main.js' ], ready); } else if (/pad/.test(pathname)) { $('body').append(h('body', Pages[pathname]()).innerHTML); require([ '/pad/main.js' ], ready); diff --git a/www/friends/index.html b/www/contacts/index.html similarity index 100% rename from www/friends/index.html rename to www/contacts/index.html diff --git a/www/friends/inner.html b/www/contacts/inner.html similarity index 75% rename from www/friends/inner.html rename to www/contacts/inner.html index 3809c9ac6..ebfb164c8 100644 --- a/www/friends/inner.html +++ b/www/contacts/inner.html @@ -3,7 +3,7 @@ - + diff --git a/www/friends/inner.js b/www/contacts/inner.js similarity index 93% rename from www/friends/inner.js rename to www/contacts/inner.js index 5ea8cf63e..556f37ee3 100644 --- a/www/friends/inner.js +++ b/www/contacts/inner.js @@ -2,7 +2,7 @@ define([ 'jquery', 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/friends/main.less', + 'less!/contacts/main.less', 'less!/customize/src/less/toolbar.less', ], function ($) { $('.loading-hidden').removeClass('loading-hidden'); diff --git a/www/friends/main.js b/www/contacts/main.js similarity index 100% rename from www/friends/main.js rename to www/contacts/main.js diff --git a/www/friends/main.less b/www/contacts/main.less similarity index 100% rename from www/friends/main.less rename to www/contacts/main.less