-
+
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 91%
rename from www/friends/main.js
rename to www/contacts/main.js
index c7c57965c..c89d31a95 100644
--- a/www/friends/main.js
+++ b/www/contacts/main.js
@@ -25,14 +25,15 @@ define([
var $messages = $iframe.find('#messaging');
var $bar = $iframe.find('.toolbar-container');
- var displayed = ['useradmin', 'newpad', 'limit'];
+ var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle'];
var configTb = {
displayed: displayed,
ifrw: ifrw,
common: Cryptpad,
$container: $bar,
- network: Cryptpad.getNetwork()
+ network: Cryptpad.getNetwork(),
+ pageTitle: Messages.contacts_title,
};
var toolbar = APP.toolbar = Toolbar.create(configTb);
toolbar.$rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar
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
diff --git a/www/invite/main.js b/www/invite/main.js
index 0ad8138e7..21d084757 100644
--- a/www/invite/main.js
+++ b/www/invite/main.js
@@ -2,9 +2,26 @@ define([
'jquery',
'/common/cryptpad-common.js',
'/bower_components/chainpad-listmap/chainpad-listmap.js',
- '/common/curve.js',
+ //'/common/curve.js',
'less!/invite/main.less',
-], function ($, Cryptpad, Listmap, Curve) {
+], function ($, Cryptpad /*, Listmap, Curve*/) {
+ var Messages = Cryptpad.Messages;
+ var comingSoon = function () {
+ return $('', {
+ 'class': 'coming-soon',
+ })
+ .text(Messages.comingSoon)
+ .append('
');
+ };
+
+ $(function () {
+ Cryptpad.removeLoadingScreen();
+ console.log("wut");
+ $('body #mainBlock').append(comingSoon());
+ });
+ return;
+
+ /* jshint ignore:start */
var APP = window.APP = {};
//var Messages = Cryptpad.Messages;
@@ -83,4 +100,5 @@ define([
andThen();
});
});
+ /* jshint ignore:end */
});
diff --git a/www/invite/main.less b/www/invite/main.less
index d3d3f2e07..4ef2a8fa4 100644
--- a/www/invite/main.less
+++ b/www/invite/main.less
@@ -1,3 +1,4 @@
+/*
.cp {
#mainBlock {
z-index: 1;
@@ -135,3 +136,15 @@
justify-content: center;
}
}
+*/
+
+.coming-soon {
+ text-align: center;
+ font-size: 25px;
+
+ height: 100%;
+ display: flex;
+ flex-flow: column;
+ align-items: center;
+ justify-content: center;
+}
diff --git a/www/profile/main.js b/www/profile/main.js
index 03ec334d8..4c9274d90 100644
--- a/www/profile/main.js
+++ b/www/profile/main.js
@@ -82,7 +82,7 @@ define([
var CREATE_ID = "createProfile";
var HEADER_ID = "header";
var HEADER_RIGHT_ID = "rightside";
- var CREATE_INVITE_BUTTON = 'inviteButton';
+ var CREATE_INVITE_BUTTON = 'inviteButton'; /* jshint ignore: line */
var VIEW_PROFILE_BUTTON = 'viewProfileButton';
var createEditableInput = function ($block, name, ph, getValue, setValue, realtime, fallbackValue) {
@@ -158,12 +158,14 @@ define([
};
*/
+/* jshint ignore:start */
var isFriend = function (proxy, edKey) {
var friends = Cryptpad.find(proxy, ['friends']);
return typeof(edKey) === 'string' && friends && (edKey in friends);
};
var addCreateInviteLinkButton = function ($container) {
+ return;
var obj = APP.lm.proxy;
var proxy = Cryptpad.getProxy();
@@ -204,6 +206,7 @@ define([
})
.appendTo($container);
};
+ /* jshint ignore:end */
var addViewButton = function ($container) {
if (!Cryptpad.isLoggedIn() || window.location.hash) {
@@ -238,7 +241,7 @@ define([
$span.text(value || Messages.anonymous);
});
- addCreateInviteLinkButton($block);
+ //addCreateInviteLinkButton($block);
return;
}
var setValue = function (value, cb) {
diff --git a/www/profile/main.less b/www/profile/main.less
index 0de830fde..d0aa180de 100644
--- a/www/profile/main.less
+++ b/www/profile/main.less
@@ -23,7 +23,7 @@
height: 300px;
width: 300px;
border: 1px solid black;
- border-radius: 150px;
+ border-radius: 4px;
overflow: hidden;
position: relative;
.delete {