From b13a453d25ff31d19ec7550b3ceb03b633b6036a Mon Sep 17 00:00:00 2001 From: Mathew May Date: Fri, 22 Feb 2019 15:25:04 +0800 Subject: [PATCH] MDL-58428 theme: Move templates from lib --- lib/templates/action_menu.mustache | 33 +- lib/templates/action_menu_link.mustache | 6 +- lib/templates/action_menu_trigger.mustache | 98 +++++- .../auth_digital_minor_page.mustache | 37 ++- .../auth_verify_age_location_page.mustache | 45 ++- lib/templates/availability_info.mustache | 34 +- .../core => lib/templates}/block.mustache | 0 lib/templates/chooser.mustache | 4 +- lib/templates/columns-1to1to1.mustache | 8 +- lib/templates/columns-1to2.mustache | 6 +- lib/templates/columns-2to1.mustache | 6 +- .../templates}/custom_menu_item.mustache | 0 lib/templates/dataformat_selector.mustache | 24 +- .../filemanager_confirmdialog.mustache | 0 .../filemanager_default_searchform.mustache | 0 .../filemanager_fileselect.mustache | 0 .../templates}/filemanager_loginform.mustache | 0 .../filemanager_modal_generallayout.mustache | 0 .../filemanager_page_generallayout.mustache | 0 .../filemanager_processexistingfile.mustache | 0 ...nager_processexistingfilemultiple.mustache | 0 .../filemanager_selectlayout.mustache | 0 .../filemanager_uploadform.mustache | 0 .../form_autocomplete_input.mustache | 2 +- .../form_autocomplete_selection.mustache | 7 +- lib/templates/help_icon.mustache | 25 +- lib/templates/initials_bar.mustache | 30 +- lib/templates/loginform.mustache | 301 +++++++++++------- lib/templates/modal.mustache | 44 +-- lib/templates/modal_backdrop.mustache | 2 +- .../core => lib/templates}/navbar.mustache | 0 lib/templates/notification_error.mustache | 10 +- lib/templates/notification_info.mustache | 9 +- lib/templates/notification_success.mustache | 8 +- lib/templates/notification_warning.mustache | 8 +- .../templates}/preferences_groups.mustache | 0 lib/templates/progress_bar.mustache | 24 +- lib/templates/select_time.mustache | 4 +- lib/templates/settings_link_page.mustache | 150 ++++----- .../settings_link_page_single.mustache | 2 +- lib/templates/signup_form_layout.mustache | 27 +- lib/templates/single_button.mustache | 2 +- lib/templates/skip_links.mustache | 11 +- .../core => lib/templates}/tabtree.mustache | 0 .../core/action_menu_trigger.mustache | 120 ------- .../core/auth_digital_minor_page.mustache | 58 ---- .../auth_verify_age_location_page.mustache | 64 ---- .../templates/core/availability_info.mustache | 61 ---- theme/boost/templates/core/help_icon.mustache | 25 -- theme/boost/templates/core/loginform.mustache | 244 -------------- .../core/settings_link_page.mustache | 147 --------- .../core/signup_form_layout.mustache | 33 -- .../templates/core/action_menu.mustache | 33 +- .../templates/core/action_menu_item.mustache | 0 .../templates/core/action_menu_link.mustache | 6 +- .../core/action_menu_trigger.mustache | 30 ++ .../core/auth_digital_minor_page.mustache | 37 +++ .../auth_verify_age_location_page.mustache | 37 +++ .../templates/core/chooser.mustache | 4 +- .../templates/core/columns-1to1to1.mustache | 8 +- .../templates/core/columns-1to2.mustache | 6 +- .../templates/core/columns-2to1.mustache | 6 +- .../core/dataformat_selector.mustache | 24 +- .../core/form_autocomplete_input.mustache | 2 +- .../core/form_autocomplete_selection.mustache | 7 +- .../templates/core/help_icon.mustache | 38 +++ .../templates/core/initials_bar.mustache | 30 +- .../templates/core/loginform.mustache | 183 +++++++++++ .../templates/core/modal.mustache | 44 +-- .../templates/core/modal_backdrop.mustache | 2 +- .../core/notification_error.mustache | 10 +- .../templates/core/notification_info.mustache | 9 +- .../core/notification_success.mustache | 8 +- .../core/notification_warning.mustache | 8 +- .../templates/core/progress_bar.mustache | 24 +- .../templates/core/select_time.mustache | 4 +- .../core/settings_link_page.mustache | 145 +++++++++ .../core/settings_link_page_single.mustache | 2 +- .../core/signup_form_layout.mustache | 10 + .../templates/core/single_button.mustache | 2 +- .../templates/core/skip_links.mustache | 11 +- 81 files changed, 1208 insertions(+), 1241 deletions(-) rename {theme/boost/templates/core => lib/templates}/block.mustache (100%) rename {theme/boost/templates/core => lib/templates}/custom_menu_item.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_confirmdialog.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_default_searchform.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_fileselect.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_loginform.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_modal_generallayout.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_page_generallayout.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_processexistingfile.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_processexistingfilemultiple.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_selectlayout.mustache (100%) rename {theme/boost/templates/core => lib/templates}/filemanager_uploadform.mustache (100%) rename {theme/boost/templates/core => lib/templates}/navbar.mustache (100%) rename {theme/boost/templates/core => lib/templates}/preferences_groups.mustache (100%) rename {theme/boost/templates/core => lib/templates}/tabtree.mustache (100%) delete mode 100644 theme/boost/templates/core/action_menu_trigger.mustache delete mode 100644 theme/boost/templates/core/auth_digital_minor_page.mustache delete mode 100644 theme/boost/templates/core/auth_verify_age_location_page.mustache delete mode 100644 theme/boost/templates/core/availability_info.mustache delete mode 100644 theme/boost/templates/core/help_icon.mustache delete mode 100644 theme/boost/templates/core/loginform.mustache delete mode 100644 theme/boost/templates/core/settings_link_page.mustache delete mode 100644 theme/boost/templates/core/signup_form_layout.mustache rename theme/{boost => bootstrapbase}/templates/core/action_menu.mustache (55%) rename theme/{boost => bootstrapbase}/templates/core/action_menu_item.mustache (100%) rename theme/{boost => bootstrapbase}/templates/core/action_menu_link.mustache (88%) create mode 100644 theme/bootstrapbase/templates/core/action_menu_trigger.mustache create mode 100644 theme/bootstrapbase/templates/core/auth_digital_minor_page.mustache create mode 100644 theme/bootstrapbase/templates/core/auth_verify_age_location_page.mustache rename theme/{boost => bootstrapbase}/templates/core/chooser.mustache (94%) rename theme/{boost => bootstrapbase}/templates/core/columns-1to1to1.mustache (86%) rename theme/{boost => bootstrapbase}/templates/core/columns-1to2.mustache (88%) rename theme/{boost => bootstrapbase}/templates/core/columns-2to1.mustache (88%) rename theme/{boost => bootstrapbase}/templates/core/dataformat_selector.mustache (68%) rename theme/{boost => bootstrapbase}/templates/core/form_autocomplete_input.mustache (83%) rename theme/{boost => bootstrapbase}/templates/core/form_autocomplete_selection.mustache (83%) create mode 100644 theme/bootstrapbase/templates/core/help_icon.mustache rename theme/{boost => bootstrapbase}/templates/core/initials_bar.mustache (75%) create mode 100644 theme/bootstrapbase/templates/core/loginform.mustache rename theme/{boost => bootstrapbase}/templates/core/modal.mustache (53%) rename theme/{boost => bootstrapbase}/templates/core/modal_backdrop.mustache (91%) rename theme/{boost => bootstrapbase}/templates/core/notification_error.mustache (84%) rename theme/{boost => bootstrapbase}/templates/core/notification_info.mustache (88%) rename theme/{boost => bootstrapbase}/templates/core/notification_success.mustache (88%) rename theme/{boost => bootstrapbase}/templates/core/notification_warning.mustache (88%) rename theme/{boost => bootstrapbase}/templates/core/progress_bar.mustache (67%) rename theme/{boost => bootstrapbase}/templates/core/select_time.mustache (92%) create mode 100644 theme/bootstrapbase/templates/core/settings_link_page.mustache rename theme/{boost => bootstrapbase}/templates/core/settings_link_page_single.mustache (96%) create mode 100644 theme/bootstrapbase/templates/core/signup_form_layout.mustache rename theme/{boost => bootstrapbase}/templates/core/single_button.mustache (97%) rename theme/{boost => bootstrapbase}/templates/core/skip_links.mustache (60%) diff --git a/lib/templates/action_menu.mustache b/lib/templates/action_menu.mustache index bb1167ae3b8..ab38ebab653 100644 --- a/lib/templates/action_menu.mustache +++ b/lib/templates/action_menu.mustache @@ -30,31 +30,26 @@ } } }} -
+
{{#primary}} -
    +
    - {{#prioritise}}
  • {{> core/action_menu_trigger }}
    • {{/prioritise}}{{#items}}
  • {{> core/action_menu_item }}
    • {{/items}}{{^prioritise}}
  • {{> core/action_menu_trigger }}
    • {{/prioritise}} + {{^prioritise}} +
    + {{> core/action_menu_trigger }} +
    + {{/prioritise}} -
+
{{/primary}} - - {{#secondary}} - - {{/secondary}}
-{{#js}} -require(['core/yui'], function(Y) { - Y.use('moodle-core-actionmenu', function() { - M.core.actionmenu.init(); - }); -}); -{{/js}} diff --git a/lib/templates/action_menu_link.mustache b/lib/templates/action_menu_link.mustache index cec09b71261..0e9f42af6cd 100644 --- a/lib/templates/action_menu_link.mustache +++ b/lib/templates/action_menu_link.mustache @@ -23,14 +23,12 @@ { "text": "Example link text", "showtext": true, - "url": "http://example.com/link", - "classes": "menu-action", - "instance": "1" + "url": "http://example.com/link" } }} {{^disabled}} {{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}{{{text}}}{{/showtext}} {{/disabled}} {{#disabled}} - {{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}} + {{#icon}}{{#pix}}{{key}},{{component}},{{title}}{{/pix}}{{/icon}}{{{text}}} {{/disabled}} diff --git a/lib/templates/action_menu_trigger.mustache b/lib/templates/action_menu_trigger.mustache index fce1a8b7e1f..8efab38b393 100644 --- a/lib/templates/action_menu_trigger.mustache +++ b/lib/templates/action_menu_trigger.mustache @@ -21,10 +21,100 @@ Example context (json): { + "text": "Example link text", + "title": "Example link title", + "url": "http://example.com/link", + "classes": "icon menu-action", "instance": "1", - "title": "Trigger me!", - "menutrigger": true, - "triggerextraclasses": "" + "triggerextraclasses": "", + "attributes": [ + {"name": "role", "value": "menuitem" }, + {"name": "data-title", "value": "mymoodle,admin" } + ], + "secondary": { + "classes": "menu align-tr-br", + "attributes": [ + {"name": "id", "value": "action-menu-0-menu"}, + {"name": "data-rel", "value": "menu-content"}, + {"name": "role", "value": "menu"}, + {"name": "data-align", "value": "tr-br"} + ], + "items": [ + {"actionmenulink": + { + "id": "action_link59ecf8394a68078", + "disabled": false, + "text": "Dashboard", + "url": "http://example.com/link", + "icon": { + "key": "i/dashboard", + "component": null, + "title": "Dashboard" + }, + "classes": "icon menu-action", + "attributes": [ + {"name": "role", "value": "menuitem"}, + {"name": "data-title", "value": "mymoodle,admin"} + ], + "instance": 1, + "showtext": true + } + }, + {"actionmenufiller": + { + "id": "action_link59ecf8394a68079", + "disabled": false, + "text": "", + "url": "", + "icon": null, + "classes": "", + "attributes": [ + {"name": "role", "value": "menuitem"} + ] + } + } + ] + } } }} -{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}{{/menutrigger}} +
+ + {{#secondary}} + + {{/secondary}} +
diff --git a/lib/templates/auth_digital_minor_page.mustache b/lib/templates/auth_digital_minor_page.mustache index 33b06885f83..a2fac7b681b 100644 --- a/lib/templates/auth_digital_minor_page.mustache +++ b/lib/templates/auth_digital_minor_page.mustache @@ -26,12 +26,33 @@ "homelink": "/" } }} -

{{#str}}considereddigitalminor{{/str}}

-

{{#str}}digitalminor_desc{{/str}}

-
-

{{{supportname}}}

-

{{{supportemail}}}

-
-
- {{#str}}backtohome{{/str}} +
+
+
+
+
+
+ {{#logourl}} +

{{sitename}}

+ {{/logourl}} + {{^logourl}} +

{{sitename}}

+ {{/logourl}} +
+
+
+

{{#str}}considereddigitalminor{{/str}}

+
+
+

{{#str}}digitalminor_desc{{/str}}

+

{{{supportname}}}

+

{{{supportemail}}}

+
+
+ {{#str}}backtohome{{/str}} +
+
+
+
+
diff --git a/lib/templates/auth_verify_age_location_page.mustache b/lib/templates/auth_verify_age_location_page.mustache index 2d398f8a067..c462587472b 100644 --- a/lib/templates/auth_verify_age_location_page.mustache +++ b/lib/templates/auth_verify_age_location_page.mustache @@ -25,13 +25,40 @@ "formhtml": "(Form html would go here)" } }} -{{#error}} -
- - + +
diff --git a/lib/templates/columns-1to1to1.mustache b/lib/templates/columns-1to1to1.mustache index 73718dedb0e..adb10382c78 100644 --- a/lib/templates/columns-1to1to1.mustache +++ b/lib/templates/columns-1to1to1.mustache @@ -41,8 +41,8 @@ } }} -
-
{{$ column1 }}{{{ col1content }}}{{/ column1 }}
-
{{$ column2 }}{{{ col2content }}}{{/ column2 }}
-
{{$ column3 }}{{{ col3content }}}{{/ column3 }}
+
+
{{$ column1 }}{{{ col1content }}}{{/ column1 }}
+
{{$ column2 }}{{{ col2content }}}{{/ column2 }}
+
{{$ column3 }}{{{ col3content }}}{{/ column3 }}
diff --git a/lib/templates/columns-1to2.mustache b/lib/templates/columns-1to2.mustache index 24133425305..114efcb6826 100644 --- a/lib/templates/columns-1to2.mustache +++ b/lib/templates/columns-1to2.mustache @@ -39,7 +39,7 @@ } }} -
-
{{$ column1 }}{{{ col1content }}}{{/ column1 }}
-
{{$ column2 }}{{{ col2content }}}{{/ column2 }}
+
+
{{$ column1 }}{{{ col1content }}}{{/ column1 }}
+
{{$ column2 }}{{{ col2content }}}{{/ column2 }}
diff --git a/lib/templates/columns-2to1.mustache b/lib/templates/columns-2to1.mustache index d66b341d74b..68f6e76a976 100644 --- a/lib/templates/columns-2to1.mustache +++ b/lib/templates/columns-2to1.mustache @@ -38,7 +38,7 @@ "col2content": "
2. Vivamus ac orci in velit fringilla aliquam a a nisl. Cras luctus quam laoreet magna pulvinar aliquet.
" } }} -
-
{{$ column1 }}{{{ col1content }}}{{/ column1 }}
-
{{$ column2 }}{{{ col2content }}}{{/ column2 }}
+
+
{{$ column1 }}{{{ col1content }}}{{/ column1 }}
+
{{$ column2 }}{{{ col2content }}}{{/ column2 }}
diff --git a/theme/boost/templates/core/custom_menu_item.mustache b/lib/templates/custom_menu_item.mustache similarity index 100% rename from theme/boost/templates/core/custom_menu_item.mustache rename to lib/templates/custom_menu_item.mustache diff --git a/lib/templates/dataformat_selector.mustache b/lib/templates/dataformat_selector.mustache index 6f5110161db..569bc369984 100644 --- a/lib/templates/dataformat_selector.mustache +++ b/lib/templates/dataformat_selector.mustache @@ -17,8 +17,6 @@ {{! @template core/dataformat_selector - Template for dataformat selection and download form. - Context variables required for this template: * label * base @@ -32,24 +30,26 @@ { "base": "http://example.org/", "name": "test", + "value": "test", "label": "Download table data as", "params": false, "options": [{"label": "CSV", "name": "csv"}, {"label": "Excel", "name": "excel"}], - "submit": "Download" + "submit": "Download", + "sesskey": "" } }} -
-
+ +
- - + {{#options}} + + {{/options}} - + {{#params}} - + {{/params}}
diff --git a/theme/boost/templates/core/filemanager_confirmdialog.mustache b/lib/templates/filemanager_confirmdialog.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_confirmdialog.mustache rename to lib/templates/filemanager_confirmdialog.mustache diff --git a/theme/boost/templates/core/filemanager_default_searchform.mustache b/lib/templates/filemanager_default_searchform.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_default_searchform.mustache rename to lib/templates/filemanager_default_searchform.mustache diff --git a/theme/boost/templates/core/filemanager_fileselect.mustache b/lib/templates/filemanager_fileselect.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_fileselect.mustache rename to lib/templates/filemanager_fileselect.mustache diff --git a/theme/boost/templates/core/filemanager_loginform.mustache b/lib/templates/filemanager_loginform.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_loginform.mustache rename to lib/templates/filemanager_loginform.mustache diff --git a/theme/boost/templates/core/filemanager_modal_generallayout.mustache b/lib/templates/filemanager_modal_generallayout.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_modal_generallayout.mustache rename to lib/templates/filemanager_modal_generallayout.mustache diff --git a/theme/boost/templates/core/filemanager_page_generallayout.mustache b/lib/templates/filemanager_page_generallayout.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_page_generallayout.mustache rename to lib/templates/filemanager_page_generallayout.mustache diff --git a/theme/boost/templates/core/filemanager_processexistingfile.mustache b/lib/templates/filemanager_processexistingfile.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_processexistingfile.mustache rename to lib/templates/filemanager_processexistingfile.mustache diff --git a/theme/boost/templates/core/filemanager_processexistingfilemultiple.mustache b/lib/templates/filemanager_processexistingfilemultiple.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_processexistingfilemultiple.mustache rename to lib/templates/filemanager_processexistingfilemultiple.mustache diff --git a/theme/boost/templates/core/filemanager_selectlayout.mustache b/lib/templates/filemanager_selectlayout.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_selectlayout.mustache rename to lib/templates/filemanager_selectlayout.mustache diff --git a/theme/boost/templates/core/filemanager_uploadform.mustache b/lib/templates/filemanager_uploadform.mustache similarity index 100% rename from theme/boost/templates/core/filemanager_uploadform.mustache rename to lib/templates/filemanager_uploadform.mustache diff --git a/lib/templates/form_autocomplete_input.mustache b/lib/templates/form_autocomplete_input.mustache index 805b1622fa6..ea4614dcd9a 100644 --- a/lib/templates/form_autocomplete_input.mustache +++ b/lib/templates/form_autocomplete_input.mustache @@ -36,7 +36,7 @@ { "inputID": 1, "suggestionsId": 2, "selectionId": 3, "downArrowId": 4, "placeholder": "Select something" } }} {{#showSuggestions}} -▼ +▼ {{/showSuggestions}} {{^showSuggestions}} diff --git a/lib/templates/form_autocomplete_selection.mustache b/lib/templates/form_autocomplete_selection.mustache index 90e1c2b0aac..5413dc33a9a 100644 --- a/lib/templates/form_autocomplete_selection.mustache +++ b/lib/templates/form_autocomplete_selection.mustache @@ -37,15 +37,14 @@ { "label": "Another item label with tags", "value": "4" } ], "noSelectionString": "No selection" } }} -
+
{{#str}}selecteditems, form{{/str}} {{#items}} - + {{#multiple}}{{/multiple}}{{{label}}} {{/items}} {{^items}} - {{noSelectionString}} + {{noSelectionString}} {{/items}}
-
diff --git a/lib/templates/help_icon.mustache b/lib/templates/help_icon.mustache index 72b2dcd59b0..a52440bbdde 100644 --- a/lib/templates/help_icon.mustache +++ b/lib/templates/help_icon.mustache @@ -1,19 +1,3 @@ -{{! - This file is part of Moodle - http://moodle.org/ - - Moodle is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Moodle is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Moodle. If not, see . -}} {{! @template core/help_icon @@ -33,6 +17,9 @@ } } }} - - {{#icon}}{{>core/pix_icon}}{{/icon}}{{#linktext}}{{.}}{{/linktext}} - + + {{#pix}}help, core, {{{alt}}}{{/pix}} + diff --git a/lib/templates/initials_bar.mustache b/lib/templates/initials_bar.mustache index 2fe1331b5ce..7f02e93d3ee 100644 --- a/lib/templates/initials_bar.mustache +++ b/lib/templates/initials_bar.mustache @@ -73,24 +73,30 @@ ] } }} -
- {{title}} - {{#current}} - {{all}} - {{/current}} - {{^current}} -
{{all}}
- {{/current}} +
+ {{title}} -
+
+
    + {{#current}} +
  • + {{all}} +
    • + {{/current}} + {{^current}} +
  • + {{all}} +
    • + {{/current}} +
{{#group}} -
    +
      {{#letter}} {{#selected}} -
    • {{name}}
      • +
    • {{name}}
      • {{/selected}} {{^selected}} -
    • {{name}}
      • +
    • {{name}}
      • {{/selected}} {{/letter}}
    diff --git a/lib/templates/loginform.mustache b/lib/templates/loginform.mustache index 9448feab522..b0cdaa055e4 100644 --- a/lib/templates/loginform.mustache +++ b/lib/templates/loginform.mustache @@ -19,149 +19,210 @@ Moodle template for the login page. + Context variables required for this template: + * autofocusform: Auto focus on form ?, + * canloginasguest - Is guest login allowed?, + * canloginbyemail - Is login by email allowed?, + * cansignup - Signup allowed?, + * cookieshelpicon - cookies help icon details + * error - Any errors in the form?, + * forgotpasswordurl - Forgot password url, + * hasidentityproviders - Flag, set to true to hide identity providers, + * hasinstructions - Flag, set to true to show instructions, + * identityproviders - List of identiy providers, + * instructions - Instructions, + * instructionsformat - Format of instructions, + * loginurl - Login url, + * rememberusername - Remeber username?, + * signupurl - Signup url, + * cookieshelpiconformatted - Formatted html of cookies help icon, + * errorformatted - Formatted error, + * logourl - Flag, logo url, + * sitename - Name of site. + * logintoken - Random token to protect login request. + Example context (json): { "autofocusform": false, - "canloginasguest": true, - "canloginbyemail": true, + "canloginasguest": "1", + "canloginbyemail": false, "cansignup": true, - "error": "testerror", - "errorformatted": "Test error formatted", - "forgotpasswordurl": "http://example.com/login/forgot_password.php", + "cookieshelpicon": { + "heading": "Cookies must be enabled in your browser", + "text": "
    Two cookies are used on this site. Both died..
    ", + "icon": { + "attributes": [ + { + "name": "class", + "value": "iconhelp" + }, + { + "name": "alt", + "value": "Help with Cookies must be enabled in your browser" + }, + { + "name": "title", + "value": "Help with Cookies must be enabled in your browser" + }, + { + "name": "src", + "value": "http://localhost/stable_master/theme/image.php?theme=boost&component=core&image=help" + } + ] + }, + "linktext": null, + "title": "Help with Cookies must be enabled in your browser", + "url": "http://localhost/stable_master/help.php?component=core&identifier=cookiesenabled&lang=en", + "ltr": true + }, + "error": "", + "forgotpasswordurl": "http://localhost/stable_master/login/forgot_password.php", "hasidentityproviders": false, "hasinstructions": true, + "identityproviders": [], "instructions": "For full access to this site, you first need to create an account.", - "loginurl": "http://example.com/stable_master/login/index.php", + "instructionsformat": "1", + "loginurl": "http://localhost/stable_master/login/index.php", "rememberusername": true, "signupurl": "http://localhost/stable_master/login/signup.php", "cookieshelpiconformatted": "", - "username": "", + "errorformatted": "", + "logourl": false, + "sitename": "Beer & Chips", "logintoken": "randomstring" } }} -{{#hasinstructions}} -
    -{{/hasinstructions}} -{{^hasinstructions}} -
    -{{/hasinstructions}} -
    - {{#cansignup}} -
    - -
    - {{/cansignup}} - -

    {{#str}} login {{/str}}

    - -
    - {{#error}} - - {{/error}} -
    -
    -
    - -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    - -
    - {{#rememberusername}} -
    - - -
    - {{/rememberusername}} -
    - - - - -
    - {{#str}} forgotten {{/str}} -
    -
    - -
    - {{#str}} cookiesenabled {{/str}} - {{{cookieshelpiconformatted}}} -
    - -
    - - {{#canloginasguest}} -
    -
    {{#str}} someallowguest {{/str}}
    -
    -
    - - - - -
    -
    -
    - {{/canloginasguest}} - -
    - -
    - {{#hasinstructions}} -

    {{#str}} firsttime {{/str}}

    -
    - {{{instructions}}} +
    +
    +
    +
    +
    + {{#logourl}} +

    {{sitename}}

    + {{/logourl}} + {{^logourl}} +

    {{sitename}}

    + {{/logourl}} +
    {{#cansignup}} -
    -
    -
    - -
    -
    +
    + {{#str}} tocreatenewaccount {{/str}}
    {{/cansignup}} -
    - {{/hasinstructions}} - {{#hasidentityproviders}} -
    -
    {{#str}} potentialidps, auth {{/str}}
    -
    - {{#identityproviders}} -
    - - {{#iconurl}} - - {{/iconurl}} - {{name}} - + {{#error}} +
    + {{error}} + +
    + {{/error}} + +
    +
    +
    + + + +
    + + +
    +
    + + +
    + {{#rememberusername}} +
    + + +
    + {{/rememberusername}} + + +
    +
    + +
    +
    +

    {{#str}}forgotten{{/str}}

    - {{/identityproviders}} + +
    + {{#str}} cookiesenabled {{/str}} + {{{cookieshelpiconformatted}}} +
    + {{#canloginasguest}} +
    +

    {{#str}}someallowguest{{/str}}

    +
    + + + + +
    +
    + {{/canloginasguest}} + + {{#hasidentityproviders}} +
    {{#str}} potentialidps, auth {{/str}}
    +
    + {{#identityproviders}} +
    + + {{#iconurl}} + + {{/iconurl}} + {{name}} + +
    + {{/identityproviders}} +
    + {{/hasidentityproviders}} +
    - {{/hasidentityproviders}}
    +
    +
    + + +{{#hasinstructions}} +
    +
    +
    +
    +
    +

    {{#str}}firsttime{{/str}}

    +
    +
    + {{{instructions}}} + {{#cansignup}} +
    + +
    + {{/cansignup}} +
    +
    +
    +
    +
    +{{/hasinstructions}} {{#js}} {{#error}} diff --git a/lib/templates/modal.mustache b/lib/templates/modal.mustache index ab5c8122a6a..1e8586b1ada 100644 --- a/lib/templates/modal.mustache +++ b/lib/templates/modal.mustache @@ -40,28 +40,28 @@ } }} -