From d65438f93151fe457d5bcabf6d2bc7df52f6793a Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 15 Oct 2018 10:44:24 +0200 Subject: Compile federationscope menu handlebars template Signed-off-by: Roeland Jago Douma --- build/compile-handlebars-templates.sh | 2 +- settings/js/authtoken.handlebars | 26 ----------------- settings/js/federationscopemenu.js | 20 +------------ settings/js/templates.js | 33 ++++++++++++++++++++++ settings/js/templates/authtoken.handlebars | 26 +++++++++++++++++ .../js/templates/federationscopemenu.handlebars | 17 +++++++++++ .../templates/settings/personal/personal.info.php | 1 + 7 files changed, 79 insertions(+), 46 deletions(-) delete mode 100644 settings/js/authtoken.handlebars create mode 100644 settings/js/templates/authtoken.handlebars create mode 100644 settings/js/templates/federationscopemenu.handlebars diff --git a/build/compile-handlebars-templates.sh b/build/compile-handlebars-templates.sh index 2f83dd3956a..2b8fd4a6204 100755 --- a/build/compile-handlebars-templates.sh +++ b/build/compile-handlebars-templates.sh @@ -5,7 +5,7 @@ REPODIR=`git rev-parse --show-toplevel` cd $REPODIR # Settings -handlebars -n OC.Settings.Templates settings/js/authtoken.handlebars -f settings/js/templates.js +handlebars -n OC.Settings.Templates settings/js/templates -f settings/js/templates.js # Contactsmenu handlebars -n OC.ContactsMenu.Templates core/js/contactsmenu -f core/js/contactsmenu_templates.js diff --git a/settings/js/authtoken.handlebars b/settings/js/authtoken.handlebars deleted file mode 100644 index 7c222d863fe..00000000000 --- a/settings/js/authtoken.handlebars +++ /dev/null @@ -1,26 +0,0 @@ - - -
- - - {{name}} - - - {{lastActivity}} - - {{#if showMore}}{{/if}} -
- {{#if canScope}} -
  • - -
    -
    • - {{/if}} - {{#if canDelete}} -
  • - {{revokeText}} -
    • - {{/if}} -
    - - diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js index 92db261b8fd..e55b26198eb 100644 --- a/settings/js/federationscopemenu.js +++ b/settings/js/federationscopemenu.js @@ -11,22 +11,6 @@ /* global OC, Handlebars */ (function() { - var TEMPLATE_MENU = - ''; - /** * Construct a new FederationScopeMenu instance * @constructs FederationScopeMenu @@ -76,8 +60,6 @@ 'click a.action': '_onClickAction' }, - template: Handlebars.compile(TEMPLATE_MENU), - /** * Event handler whenever an action has been clicked within the menu * @@ -98,7 +80,7 @@ * Renders the menu with the currently set items */ render: function() { - this.$el.html(this.template({ + this.$el.html(OC.Settings.Templates['federationscopemenu']({ items: this._scopes })); }, diff --git a/settings/js/templates.js b/settings/js/templates.js index 9d7457cd652..ea703c40c8d 100644 --- a/settings/js/templates.js +++ b/settings/js/templates.js @@ -46,4 +46,37 @@ templates['authtoken'] = template({"1":function(container,depth0,helpers,partial + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canDelete : depth0),{"name":"if","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
    \n \n\n"; },"useData":true}); +templates['federationscopemenu'] = template({"1":function(container,depth0,helpers,partials,data) { + var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; + + return "
  • \n \n" + + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.iconClass : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.program(6, data, 0),"data":data})) != null ? stack1 : "") + + "

    \n " + + alias4(((helper = (helper = helpers.displayName || (depth0 != null ? depth0.displayName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"displayName","hash":{},"data":data}) : helper))) + + "
    \n " + + alias4(((helper = (helper = helpers.tooltip || (depth0 != null ? depth0.tooltip : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tooltip","hash":{},"data":data}) : helper))) + + "\n

    \n     \n
    • \n"; +},"2":function(container,depth0,helpers,partials,data) { + return "active"; +},"4":function(container,depth0,helpers,partials,data) { + var helper; + + return " \n"; +},"6":function(container,depth0,helpers,partials,data) { + return " \n"; +},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { + var stack1; + + return "\n"; +},"useData":true}); })(); \ No newline at end of file diff --git a/settings/js/templates/authtoken.handlebars b/settings/js/templates/authtoken.handlebars new file mode 100644 index 00000000000..7c222d863fe --- /dev/null +++ b/settings/js/templates/authtoken.handlebars @@ -0,0 +1,26 @@ + + +
    + + + {{name}} + + + {{lastActivity}} + + {{#if showMore}}{{/if}} +
    + {{#if canScope}} +
  • + +
    +
    • + {{/if}} + {{#if canDelete}} +
  • + {{revokeText}} +
    • + {{/if}} +
    + + diff --git a/settings/js/templates/federationscopemenu.handlebars b/settings/js/templates/federationscopemenu.handlebars new file mode 100644 index 00000000000..e5cfd942f46 --- /dev/null +++ b/settings/js/templates/federationscopemenu.handlebars @@ -0,0 +1,17 @@ + diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php index 6fc85253499..04dcbe3a292 100644 --- a/settings/templates/settings/personal/personal.info.php +++ b/settings/templates/settings/personal/personal.info.php @@ -27,6 +27,7 @@ script('settings', [ 'usersettings', + 'templates', 'federationsettingsview', 'federationscopemenu', 'settings/personalInfo', -- cgit v1.2.3