Initial work on the 'pad will expire' logic
This commit is contained in:
@@ -5,6 +5,8 @@
|
||||
@import (once) '../../customize/src/less2/include/alertify.less';
|
||||
@import (once) '../../customize/src/less2/include/tokenfield.less';
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_code-warn;
|
||||
|
||||
.toolbar_main();
|
||||
.fileupload_main();
|
||||
.alertify_main();
|
||||
|
||||
@@ -461,7 +461,16 @@ define([
|
||||
getHeadingText: function () { return titleRecommender(); }
|
||||
}, onLocal);
|
||||
var configTb = {
|
||||
displayed: ['userlist', 'title', 'useradmin', 'spinner', 'newpad', 'share', 'limit'],
|
||||
displayed: [
|
||||
'userlist',
|
||||
'title',
|
||||
'useradmin',
|
||||
'spinner',
|
||||
'newpad',
|
||||
'share',
|
||||
'limit',
|
||||
'unpinnedWarning'
|
||||
],
|
||||
title: title.getTitleConfig(),
|
||||
metadataMgr: cpNfInner.metadataMgr,
|
||||
readOnly: readOnly,
|
||||
|
||||
@@ -719,6 +719,26 @@ define([
|
||||
return $titleContainer;
|
||||
};
|
||||
|
||||
var createUnpinnedWarning = function (toolbar, config) {
|
||||
if (Common.isLoggedIn()) { return; }
|
||||
var pd = config.metadataMgr.getPrivateData();
|
||||
var o = pd.origin;
|
||||
var hashes = pd.availableHashes;
|
||||
var url = pd.origin + pd.pathname + '#' + (hashes.editHash || hashes.viewHash);
|
||||
var cid = Hash.hrefToHexChannelId(url);
|
||||
Common.sendAnonRpcMsg('IS_CHANNEL_PINNED', cid, function (x) {
|
||||
if (x.error || !Array.isArray(x.response)) { return void console.log(x); }
|
||||
if (x.response[0] === true) { return; }
|
||||
var msg = $('<span>', {
|
||||
'class': 'cp-pad-not-pinned',
|
||||
}).append(
|
||||
Messages._getKey('padNotPinned', [o + '/login', o + '/register'])
|
||||
);
|
||||
$('.cp-toolbar-title').append(msg);
|
||||
console.log("This pad is not pinned");
|
||||
});
|
||||
};
|
||||
|
||||
var createPageTitle = function (toolbar, config) {
|
||||
if (config.title || !config.pageTitle) { return; }
|
||||
var $titleContainer = $('<span>', {
|
||||
@@ -1087,6 +1107,7 @@ define([
|
||||
tb['upgrade'] = $.noop;
|
||||
tb['newpad'] = createNewPad;
|
||||
tb['useradmin'] = createUserAdmin;
|
||||
tb['unpinnedWarning'] = createUnpinnedWarning;
|
||||
|
||||
var addElement = toolbar.addElement = function (arr, additionnalCfg, init) {
|
||||
if (typeof additionnalCfg === "object") { $.extend(true, config, additionnalCfg); }
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
@import (once) '../../customize/src/less2/include/avatar.less';
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_friends-warn;;
|
||||
|
||||
.toolbar_main();
|
||||
.fileupload_main();
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
@import (once) "../../customize/src/less2/include/limit-bar.less";
|
||||
@import (once) "../../customize/src/less2/include/tokenfield.less";
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_drive-warn;
|
||||
|
||||
.toolbar_main();
|
||||
.fileupload_main();
|
||||
.alertify_main();
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
@import (once) '../../customize/src/less2/include/alertify.less';
|
||||
@import (once) '../../customize/src/less2/include/tokenfield.less';
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_file-warn;
|
||||
|
||||
.toolbar_main();
|
||||
.fileupload_main();
|
||||
.alertify_main();
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
@import (once) '../../customize/src/less2/include/alertify.less';
|
||||
@import (once) '../../customize/src/less2/include/tokenfield.less';
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_pad-warn;
|
||||
|
||||
.toolbar_main();
|
||||
.alertify_main();
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
@import (once) '../../customize/src/less2/include/tools.less';
|
||||
@import (once) '../../customize/src/less2/include/avatar.less';
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_poll-warn;
|
||||
|
||||
.toolbar_main();
|
||||
.fileupload_main();
|
||||
.alertify_main();
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
@import (once) "../../customize/src/less2/include/markdown.less";
|
||||
@import (once) '../../customize/src/less2/include/alertify.less';
|
||||
@import (once) '../../customize/src/less2/include/sidebar-layout.less';
|
||||
@import (once) "../../customize/src/less2/include/limit-bar.less";
|
||||
@import (once) "../../customize/src/less2/include/limit-bar.less";
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_settings-warn;
|
||||
|
||||
.toolbar_main();
|
||||
.alertify_main();
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
@import (once) "../../customize/src/less2/include/mediatag.less";
|
||||
@import (once) '../../customize/src/less2/include/tokenfield.less';
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_slide-warn;
|
||||
|
||||
.mediatag_base();
|
||||
.toolbar_main();
|
||||
.fileupload_main();
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
@import (once) '../../customize/src/less2/include/tools.less';
|
||||
@import (once) '../../customize/src/less2/include/tokenfield.less';
|
||||
|
||||
@_cp-toolbar-color-warn: @colortheme_whiteboard-warn;
|
||||
|
||||
.toolbar_main();
|
||||
.fileupload_main();
|
||||
.alertify_main();
|
||||
|
||||
@@ -393,7 +393,16 @@ define([
|
||||
Title = common.createTitle({});
|
||||
|
||||
var configTb = {
|
||||
displayed: ['title', 'useradmin', 'spinner', 'share', 'userlist', 'newpad', 'limit'],
|
||||
displayed: [
|
||||
'userlist',
|
||||
'title',
|
||||
'useradmin',
|
||||
'spinner',
|
||||
'newpad',
|
||||
'share',
|
||||
'limit',
|
||||
'unpinnedWarning'
|
||||
],
|
||||
title: Title.getTitleConfig(),
|
||||
metadataMgr: metadataMgr,
|
||||
readOnly: readOnly,
|
||||
|
||||
Reference in New Issue
Block a user