diff --git a/services/web/app/views/admin/index.pug b/services/web/app/views/admin/index.pug index 0fa9017cc1..050829e9d7 100644 --- a/services/web/app/views/admin/index.pug +++ b/services/web/app/views/admin/index.pug @@ -28,10 +28,10 @@ block content tab(heading="Open Sockets") .row-spaced ul - -each agents, url in openSockets + each agents, url in openSockets li #{url} - total : #{agents.length} ul - -each agent in agents + each agent in agents li #{agent} tab(heading="Close Editor") diff --git a/services/web/app/views/contact-us-modal.pug b/services/web/app/views/contact-us-modal.pug index f4fd8938b7..d3e5aa0e87 100644 --- a/services/web/app/views/contact-us-modal.pug +++ b/services/web/app/views/contact-us-modal.pug @@ -24,10 +24,10 @@ script(type='text/ng-template', id='supportModalTemplate') a.contact-suggestion-list-item(ng-href="{{ suggestion.url }}", ng-click="clickSuggestionLink(suggestion.url);" target="_blank") span(ng-bind-html="suggestion.name") i.fa.fa-angle-right - label.desc(ng-show="'#{getUserEmail()}'.length < 1") + label.desc(ng-show="'"+getUserEmail()+"'.length < 1") | #{translate("email")} - .form-group(ng-show="'#{getUserEmail()}'.length < 1") - input.field.text.medium.span8.form-control(ng-model="form.email", ng-init="form.email = '#{getUserEmail()}'", type='email', spellcheck='false', value='', maxlength='255', tabindex='2') + .form-group(ng-show="'"+getUserEmail()+"'.length < 1") + input.field.text.medium.span8.form-control(ng-model="form.email", ng-init="form.email = '"+getUserEmail()+"'", type='email', spellcheck='false', value='', maxlength='255', tabindex='2') label#title12.desc | #{translate("project_url")} (#{translate("optional")}) .form-group @@ -37,6 +37,6 @@ script(type='text/ng-template', id='supportModalTemplate') .form-group textarea.field.text.medium.span8.form-control(ng-model="form.message",type='text', value='', tabindex='4', onkeyup='') .form-group.text-center - input.btn-success.btn.btn-lg(type='submit', ng-disabled="sending", ng-click="contactUs()" value='#{translate("contact_us")}') + input.btn-success.btn.btn-lg(type='submit', ng-disabled="sending", ng-click="contactUs()" value=translate("contact_us")) span(ng-show="sent") - p #{translate("request_sent_thank_you")} \ No newline at end of file + p #{translate("request_sent_thank_you")} diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug index 8f4d1263db..7276c0ae5c 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -30,7 +30,7 @@ html(itemscope, itemtype='http://schema.org/Product') meta(itemprop="name", content="ShareLaTeX, the Online LaTeX Editor") -if (typeof(meta) == "undefined") - meta(itemprop="description", name="description", content='#{translate("site_description")}') + meta(itemprop="description", name="description", content=translate("site_description")) -else meta(itemprop="description", name="description" , content=meta) diff --git a/services/web/app/views/layout/footer.pug b/services/web/app/views/layout/footer.pug index efd64b6f6e..62a98ecfaa 100644 --- a/services/web/app/views/layout/footer.pug +++ b/services/web/app/views/layout/footer.pug @@ -13,9 +13,9 @@ footer.site-footer data-toggle="dropdown", aria-haspopup="true", aria-expanded="false", - tooltip="#{translate('language')}" + tooltip=translate('language') ) - figure(class="sprite-icon sprite-icon-lang sprite-icon-#{currentLngCode}") + figure(class="sprite-icon sprite-icon-lang sprite-icon-"+currentLngCode) ul.dropdown-menu(role="menu") li.dropdown-header #{translate("language")} @@ -23,7 +23,7 @@ footer.site-footer if !subdomainDetails.hide li.lngOption a.menu-indent(href=subdomainDetails.url+currentUrl) - figure(class="sprite-icon sprite-icon-lang sprite-icon-#{subdomainDetails.lngCode}") + figure(class="sprite-icon sprite-icon-lang sprite-icon-"+subdomainDetails.lngCode) | #{translate(subdomainDetails.lngCode)} //- img(src="/img/flags/24/.png") each item in nav.left_footer diff --git a/services/web/app/views/layout/navbar.pug b/services/web/app/views/layout/navbar.pug index 4d78d02fba..54509d6565 100644 --- a/services/web/app/views/layout/navbar.pug +++ b/services/web/app/views/layout/navbar.pug @@ -4,7 +4,7 @@ nav.navbar.navbar-default button.navbar-toggle(ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed", ng-class="{active: !navCollapsed}") i.fa.fa-bars if settings.nav.custom_logo - a(href='/', style='background-image:url("#{settings.nav.custom_logo}")').navbar-brand + a(href='/', style='background-image:url("'+settings.nav.custom_logo+'")').navbar-brand else if (nav.title) a(href='/').navbar-title #{nav.title} else diff --git a/services/web/app/views/project/editor/chat.pug b/services/web/app/views/project/editor/chat.pug index 47a1752834..fcd47a81e3 100644 --- a/services/web/app/views/project/editor/chat.pug +++ b/services/web/app/views/project/editor/chat.pug @@ -50,7 +50,7 @@ aside.chat( .new-message textarea( - placeholder="#{translate('your_message')}...", + placeholder=translate('your_message')+"...", on-enter="sendMessage()", ng-model="newMessageContent", ng-click="resetUnreadMessages()" diff --git a/services/web/app/views/project/editor/editor.pug b/services/web/app/views/project/editor/editor.pug index bcb778fda4..98a2840069 100644 --- a/services/web/app/views/project/editor/editor.pug +++ b/services/web/app/views/project/editor/editor.pug @@ -70,7 +70,7 @@ div.full-size( ng-controller="PdfSynctexController" ) a.btn.btn-default.btn-xs( - tooltip="#{translate('go_to_code_location_in_pdf')}" + tooltip=translate('go_to_code_location_in_pdf') tooltip-placement="right" tooltip-append-to-body="true" ng-click="syncToPdf()" @@ -78,7 +78,7 @@ div.full-size( i.fa.fa-long-arrow-right br a.btn.btn-default.btn-xs( - tooltip-html="'#{translate('go_to_pdf_location_in_code')}'" + tooltip-html="'"+translate('go_to_pdf_location_in_code')+"'" tooltip-placement="right" tooltip-append-to-body="true" ng-click="syncToCode()" @@ -90,4 +90,4 @@ div.full-size( ng-show="ui.view == 'pdf'" ) include ./pdf - \ No newline at end of file + diff --git a/services/web/app/views/project/editor/file-tree.pug b/services/web/app/views/project/editor/file-tree.pug index 92af8b627d..03c2bd79b7 100644 --- a/services/web/app/views/project/editor/file-tree.pug +++ b/services/web/app/views/project/editor/file-tree.pug @@ -3,21 +3,21 @@ aside#file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected' a( href, ng-click="openNewDocModal()", - tooltip-html="'#{translate('new_file').replace(' ', '
')}'", + tooltip-html="'"+translate('new_file').replace(' ', '
')+"'", tooltip-placement="bottom" ) i.fa.fa-file a( href, ng-click="openNewFolderModal()", - tooltip-html="'#{translate('new_folder').replace(' ', '
')}'", + tooltip-html="'"+translate('new_folder').replace(' ', '
')+"'", tooltip-placement="bottom" ) i.fa.fa-folder a( href, ng-click="openUploadFileModal()", - tooltip="#{translate('upload')}", + tooltip=translate('upload'), tooltip-placement="bottom" ) i.fa.fa-upload @@ -26,7 +26,7 @@ aside#file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected' a( href, ng-click="startRenamingSelected()", - tooltip="#{translate('rename')}", + tooltip=translate('rename'), tooltip-placement="bottom", ng-show="multiSelectedCount == 0" ) @@ -34,7 +34,7 @@ aside#file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected' a( href, ng-click="openDeleteModalForSelected()", - tooltip="#{translate('delete')}", + tooltip=translate('delete'), tooltip-placement="bottom", tooltip-append-to-body="true" ) @@ -431,4 +431,4 @@ script(type='text/ng-template', id='invalidFileNameModalTemplate') .modal-footer button.btn.btn-default( ng-click="$close()" - ) #{translate('ok')} \ No newline at end of file + ) #{translate('ok')} diff --git a/services/web/app/views/project/editor/header.pug b/services/web/app/views/project/editor/header.pug index 601b18e9cf..475ba1da52 100644 --- a/services/web/app/views/project/editor/header.pug +++ b/services/web/app/views/project/editor/header.pug @@ -45,7 +45,7 @@ header.toolbar.toolbar-header.toolbar-with-labels( ng-if="permissions.admin", href='#', tooltip-placement="bottom", - tooltip="#{translate('rename')}", + tooltip=translate('rename'), tooltip-append-to-body="true", ng-click="startRenaming()", ng-show="!state.renaming" @@ -71,7 +71,7 @@ header.toolbar.toolbar-header.toolbar-with-labels( span.dropdown(dropdown, ng-if="onlineUsersArray.length >= 4") span.online-user.online-user-multi( dropdown-toggle, - tooltip="#{translate('connected_users')}", + tooltip=translate('connected_users'), tooltip-placement="left" ) strong {{ onlineUsersArray.length }} @@ -121,4 +121,4 @@ header.toolbar.toolbar-header.toolbar-with-labels( span.label.label-info( ng-show="unreadMessages > 0" ) {{ unreadMessages }} - p.toolbar-label #{translate("chat")} \ No newline at end of file + p.toolbar-label #{translate("chat")} diff --git a/services/web/app/views/project/editor/left-menu.pug b/services/web/app/views/project/editor/left-menu.pug index 80d5c606ab..4e86b31620 100644 --- a/services/web/app/views/project/editor/left-menu.pug +++ b/services/web/app/views/project/editor/left-menu.pug @@ -24,7 +24,7 @@ aside#left-menu.full-size( | PDF div.link-disabled( ng-if="!pdf.url" - tooltip="#{translate('please_compile_pdf_before_download')}" + tooltip=translate('please_compile_pdf_before_download') tooltip-placement="bottom" ) i.fa.fa-file-pdf-o.fa-2x @@ -47,7 +47,7 @@ aside#left-menu.full-size( a(href, ng-if="pdf.url" ,ng-click="openWordCountModal()") i.fa.fa-fw.fa-eye span    #{translate("word_count")} - a.link-disabled(href, ng-if="!pdf.url" , tooltip="#{translate('please_compile_pdf_before_word_count')}") + a.link-disabled(href, ng-if="!pdf.url" , tooltip=translate('please_compile_pdf_before_word_count')) i.fa.fa-fw.fa-eye span.link-disabled    #{translate("word_count")} @@ -200,7 +200,7 @@ script(type='text/ng-template', id='wordCountModalTemplate') span   #{translate("loading")}... div.pdf-disabled( ng-if="!pdf.url" - tooltip="#{translate('please_compile_pdf_before_word_count')}" + tooltip=translate('please_compile_pdf_before_word_count') tooltip-placement="bottom" ) div(ng-if="!status.loading") diff --git a/services/web/app/views/project/editor/pdf.pug b/services/web/app/views/project/editor/pdf.pug index 074856bd7c..ba03f068a6 100644 --- a/services/web/app/views/project/editor/pdf.pug +++ b/services/web/app/views/project/editor/pdf.pug @@ -2,7 +2,7 @@ div.full-size.pdf(ng-controller="PdfController") .toolbar.toolbar-tall .btn-group( dropdown, - tooltip-html="'#{translate('recompile_pdf')} ({{modifierKey}} + Enter)'" + tooltip-html="'"+translate('recompile_pdf')+" ({{modifierKey}} + Enter)'" tooltip-class="keyboard-tooltip" tooltip-popup-delay="500" tooltip-append-to-body="true" @@ -53,7 +53,7 @@ div.full-size.pdf(ng-controller="PdfController") href ng-click="stop()" ng-show="pdf.compiling", - tooltip="#{translate('stop_compile')}" + tooltip=translate('stop_compile') tooltip-placement="bottom" ) i.fa.fa-stop() @@ -61,7 +61,7 @@ div.full-size.pdf(ng-controller="PdfController") href ng-click="toggleLogs()" ng-class="{ 'active': shouldShowLogs == true }" - tooltip="#{translate('logs_and_output_files')}" + tooltip=translate('logs_and_output_files') tooltip-placement="bottom" ) i.fa.fa-file-text-o @@ -77,7 +77,7 @@ div.full-size.pdf(ng-controller="PdfController") ng-href="{{pdf.downloadUrl || pdf.url}}" target="_blank" ng-if="pdf.url" - tooltip="#{translate('download_pdf')}" + tooltip=translate('download_pdf') tooltip-placement="bottom" ) i.fa.fa-download @@ -87,7 +87,7 @@ div.full-size.pdf(ng-controller="PdfController") href, ng-click="switchToFlatLayout()" ng-show="ui.pdfLayout == 'sideBySide'" - tooltip="#{translate('full_screen')}" + tooltip=translate('full_screen') tooltip-placement="bottom" tooltip-append-to-body="true" ) @@ -96,7 +96,7 @@ div.full-size.pdf(ng-controller="PdfController") href, ng-click="switchToSideBySideLayout()" ng-show="ui.pdfLayout == 'flat'" - tooltip="#{translate('split_screen')}" + tooltip=translate('split_screen') tooltip-placement="bottom" tooltip-append-to-body="true" ) @@ -233,7 +233,7 @@ div.full-size.pdf(ng-controller="PdfController") .files-dropdown-container a.btn.btn-default.btn-sm( href, - tooltip="#{translate('clear_cached_files')}", + tooltip=translate('clear_cached_files'), tooltip-placement="top", tooltip-append-to-body="true", ng-click="openClearCacheModal()" diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug index 78fb69c333..32e0404afc 100644 --- a/services/web/app/views/project/editor/share.pug +++ b/services/web/app/views/project/editor/share.pug @@ -38,7 +38,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') .col-xs-1 a( href - tooltip="#{translate('remove_collaborator')}" + tooltip=translate('remove_collaborator') tooltip-placement="bottom" ng-click="removeMember(member)" ) @@ -55,7 +55,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') .col-xs-1 a( href - tooltip="#{translate('revoke_invite')}" + tooltip=translate('revoke_invite') tooltip-placement="bottom" ng-click="revokeInvite(invite)" ) @@ -66,7 +66,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') .form-group tags-input( template="shareTagTemplate" - placeholder="#{settings.customisation.shareProjectPlaceholder || 'joe@example.com, sue@example.com, ...'}" + placeholder=settings.customisation.shareProjectPlaceholder || 'joe@example.com, sue@example.com, ...' ng-model="inputs.contacts" focus-on="open" display-property="display" diff --git a/services/web/app/views/project/invite/show.pug b/services/web/app/views/project/invite/show.pug index eed30d3d19..d129fe015d 100644 --- a/services/web/app/views/project/invite/show.pug +++ b/services/web/app/views/project/invite/show.pug @@ -20,12 +20,12 @@ block content form.form( name="acceptForm", method="POST", - action="/project/#{invite.projectId}/invite/token/#{invite.token}/accept" + action="/project/"+invite.projectId+"/invite/token/"+invite.token+"/accept" ) input(name='_csrf', type='hidden', value=csrfToken) - input(name='token', type='hidden', value="#{invite.token}") + input(name='token', type='hidden', value=invite.token) .form-group.text-center button.btn.btn-lg.btn-primary(type="submit") | #{translate("join_project")} .form-group.text-center - \ No newline at end of file + diff --git a/services/web/app/views/project/list/project-list.pug b/services/web/app/views/project/list/project-list.pug index 01007213d0..0bb93e8336 100644 --- a/services/web/app/views/project/list/project-list.pug +++ b/services/web/app/views/project/list/project-list.pug @@ -6,7 +6,7 @@ form.project-search.form-horizontal(role="form") .form-group.has-feedback.has-feedback-left.col-md-7.col-xs-12 input.form-control.col-md-7.col-xs-12( - placeholder="#{translate('search_projects')}…", + placeholder=translate('search_projects')+"…", autofocus='autofocus', ng-model="searchText.value", focus-on='search:clear', @@ -25,7 +25,7 @@ .btn-group(ng-hide="selectedProjects.length < 1") a.btn.btn-default( href, - tooltip="#{translate('download')}", + tooltip=translate('download'), tooltip-placement="bottom", tooltip-append-to-body="true", ng-click="downloadSelectedProjects()" @@ -33,7 +33,7 @@ i.fa.fa-cloud-download a.btn.btn-default( href, - tooltip="#{translate('delete')}", + tooltip=translate('delete'), tooltip-placement="bottom", tooltip-append-to-body="true", ng-click="openArchiveProjectsModal()" @@ -45,7 +45,7 @@ href, data-toggle="dropdown", dropdown-toggle, - tooltip="#{translate('add_to_folders')}", + tooltip=translate('add_to_folders'), tooltip-append-to-body="true", tooltip-placement="bottom" ) diff --git a/services/web/app/views/referal/bonus.pug b/services/web/app/views/referal/bonus.pug index 5b0183d9c1..f3a65c6bc4 100644 --- a/services/web/app/views/referal/bonus.pug +++ b/services/web/app/views/referal/bonus.pug @@ -24,7 +24,7 @@ block content .row .col-md-8.col-md-offset-2.bonus-banner .title - a(href='https://twitter.com/share?text=is%20trying%20out%20the%20online%20LaTeX%20Editor%20ShareLaTeX&url=#{encodeURIComponent(buildReferalUrl("t"))}&counturl=https://www.sharelatex.com', target="_blank").twitter Tweet + a(href='https://twitter.com/share?text=is%20trying%20out%20the%20online%20LaTeX%20Editor%20ShareLaTeX&url='+encodeURIComponent(buildReferalUrl("t"))+'&counturl=https://www.sharelatex.com', target="_blank").twitter Tweet .row .col-md-8.col-md-offset-2.bonus-banner @@ -34,12 +34,12 @@ block content .row .col-md-8.col-md-offset-2.bonus-banner .title - a(href="https://plus.google.com/share?url=#{encodeURIComponent(buildReferalUrl('gp'))}", onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;").google-plus #{translate("share_us_on_googleplus")} + a(href="https://plus.google.com/share?url="+encodeURIComponent(buildReferalUrl('gp')), onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;").google-plus #{translate("share_us_on_googleplus")} .row .col-md-8.col-md-offset-2.bonus-banner .title - a(href='mailto:?subject=Online LaTeX editor you may like &body=Hey, I have been using the online LaTeX editor ShareLaTeX recently and thought you might like to check it out. #{encodeURIComponent(buildReferalUrl("e"))}', title='Share by Email').email #{translate("email_us_to_your_friends")} + a(href='mailto:?subject=Online LaTeX editor you may like &body=Hey, I have been using the online LaTeX editor ShareLaTeX recently and thought you might like to check it out. '+encodeURIComponent(buildReferalUrl("e")), title='Share by Email').email #{translate("email_us_to_your_friends")} .row .col-md-8.col-md-offset-2.bonus-banner @@ -58,9 +58,9 @@ block content .col-md-10.col-md-offset-1.bonus-banner(style="position: relative; height: 30px; margin-top: 20px;") - for (var i = 0; i <= 10; i++) { - if (refered_user_count == i) - .number(style="left: #{i}0%").active #{i} + .number(style="left: "+i+"0%").active #{i} - else - .number(style="left: #{i}0%") #{i} + .number(style="left: "+i+"0%") #{i} - } .row.ab-bonus @@ -68,7 +68,7 @@ block content .progress - if (refered_user_count == 0) div(style="text-align: center; padding: 4px;") #{translate("spread_the_word_and_fill_bar")} - .progress-bar.progress-bar-info(style="width: #{refered_user_count}0%") + .progress-bar.progress-bar-info(style="width: "+refered_user_count+"0%") .row.ab-bonus .col-md-10.col-md-offset-1.bonus-banner(style="position: relative; height: 70px;") diff --git a/services/web/app/views/restore.pug b/services/web/app/views/restore.pug index 51c0ee03fc..1cd7ad458a 100644 --- a/services/web/app/views/restore.pug +++ b/services/web/app/views/restore.pug @@ -19,11 +19,11 @@ block content .row-fluid table.table - -each project in projects + each project in projects tr - project_id = project._id.toString() td(width="50%") #{project.name} td(width="25%") - a.btn(href="/project/#{project_id}/zip") Download latest version as Zip + a.btn(href="/project/"+project_id+"/zip") Download latest version as Zip include general/small-footer diff --git a/services/web/app/views/scribtex-modal.pug b/services/web/app/views/scribtex-modal.pug index 1d4e2ce005..3efbf19314 100644 --- a/services/web/app/views/scribtex-modal.pug +++ b/services/web/app/views/scribtex-modal.pug @@ -5,4 +5,4 @@ script(type='text/ng-template', id='scribtexModalTemplate') p ScribTeX has moved to https://scribtex.sharelatex.com. Please update your bookmarks. p(style="text-align: center") You can find the page you were looking for here: p(style="text-align: center") - a(href="https://scribtex.sharelatex.com#{scribtexPath}", style="font-size: 16px") https://scribtex.sharelatex.com#{scribtexPath} \ No newline at end of file + a(href="https://scribtex.sharelatex.com"+scribtexPath, style="font-size: 16px") https://scribtex.sharelatex.com#{scribtexPath} diff --git a/services/web/app/views/sentry.pug b/services/web/app/views/sentry.pug index 0a51686015..5399252cd9 100644 --- a/services/web/app/views/sentry.pug +++ b/services/web/app/views/sentry.pug @@ -1,12 +1,12 @@ - if (typeof(sentrySrc) != "undefined") - if (sentrySrc.match(/^([a-z]+:)?\/\//i)) - script(src="#{sentrySrc}") + script(src=sentrySrc) - else - script(src=buildJsPath("libs/#{sentrySrc}", {fingerprint:false})) + script(src=buildJsPath("libs/"+sentrySrc, {fingerprint:false})) - if (typeof(sentrySrc) != "undefined") script(type="text/javascript"). if (typeof(Raven) != "undefined" && Raven.config) { - Raven.config("#{sentryPublicDSN}", { + Raven.config(sentryPublicDSN, { tags: { 'commit': '@@COMMIT@@', 'build': '@@RELEASE@@' }, release: '@@RELEASE@@', // Ignore list based off: https://gist.github.com/1878283 diff --git a/services/web/app/views/subscriptions/dashboard.pug b/services/web/app/views/subscriptions/dashboard.pug index 3448dc9072..fb4f834c34 100644 --- a/services/web/app/views/subscriptions/dashboard.pug +++ b/services/web/app/views/subscriptions/dashboard.pug @@ -12,7 +12,7 @@ block scripts mixin printPlan(plan) -if (!plan.hideFromUsers) - tr(ng-controller="ChangePlanFormController", ng-init="plan=#{JSON.stringify(plan)}", ng-show="shouldShowPlan(plan.planCode)") + tr(ng-controller="ChangePlanFormController", ng-init="plan="+JSON.stringify(plan), ng-show="shouldShowPlan(plan.planCode)") td strong #{plan.name} td {{refreshPrice(plan.planCode)}} @@ -22,18 +22,18 @@ mixin printPlan(plan) | {{prices[plan.planCode]}} / #{translate("month")} td -if (subscription.state == "free-trial") - a(href="/user/subscription/new?planCode=#{plan.planCode}").btn.btn-success #{translate("subscribe_to_this_plan")} + a(href="/user/subscription/new?planCode="+plan.planCode).btn.btn-success #{translate("subscribe_to_this_plan")} -else if (typeof(subscription.planCode) != "undefined" && plan.planCode == subscription.planCode.split("_")[0]) button.btn.disabled #{translate("your_plan")} -else form - input(type="hidden", ng-model="plan_code", name="plan_code", value="#{plan.planCode}") + input(type="hidden", ng-model="plan_code", name="plan_code", value=plan.planCode) input(type="submit", ng-click="changePlan()", value=translate("change_to_this_plan")).btn.btn-success mixin printPlans(plans) - -each plan in plans - mixin printPlan(plan) + each plan in plans + +printPlan(plan) block content .content.content-alt(ng-cloak) @@ -46,7 +46,7 @@ block content |   | #{translate("your_billing_details_were_saved")} .card(ng-if="view == 'overview'") - .page-header(x-current-plan="#{subscription.planCode}") + .page-header(x-current-plan=subscription.planCode) h1 #{translate("your_subscription")} - if (subscription && user._id+'' == subscription.admin_id+'') @@ -97,9 +97,9 @@ block content th !{translate("name")} th !{translate("price")} th - mixin printPlans(plans.studentAccounts) - mixin printPlans(plans.individualMonthlyPlans) - mixin printPlans(plans.individualAnnualPlans) + +printPlans(plans.studentAccounts) + +printPlans(plans.individualMonthlyPlans) + +printPlans(plans.individualAnnualPlans) each groupSubscription in groupSubscriptions @@ -107,7 +107,7 @@ block content div p !{translate("member_of_group_subscription", {admin_email: "" + groupSubscription.admin_id.email + ""})} span - button.btn.btn-danger(ng-click="removeSelfFromGroup('#{groupSubscription.admin_id._id}')") #{translate("leave_group")} + button.btn.btn-danger(ng-click="removeSelfFromGroup('"+groupSubscription.admin_id._id+"')") #{translate("leave_group")} -if(subscription.groupPlan && user._id+'' == subscription.admin_id+'') div diff --git a/services/web/app/views/subscriptions/new.pug b/services/web/app/views/subscriptions/new.pug index 1465b24c82..2d410f8fba 100644 --- a/services/web/app/views/subscriptions/new.pug +++ b/services/web/app/views/subscriptions/new.pug @@ -164,7 +164,7 @@ block content ng-change="updateCountry()" required ) - mixin countries_options() + +countries_options() span.input-feedback-message {{ simpleCCForm.country.$error.required ? 'This field is required' : '' }} if (showVatField) diff --git a/services/web/app/views/subscriptions/upgradeToAnnual.pug b/services/web/app/views/subscriptions/upgradeToAnnual.pug index d92290ad0e..0ce41856f7 100644 --- a/services/web/app/views/subscriptions/upgradeToAnnual.pug +++ b/services/web/app/views/subscriptions/upgradeToAnnual.pug @@ -6,7 +6,7 @@ block content .container(ng-controller="AnnualUpgradeController") .row(ng-cloak) .col-md-6.col-md-offset-3 - .card(ng-init="planName = #{JSON.stringify(planName)}") + .card(ng-init="planName = "+JSON.stringify(planName)) .page-header h1.text-centered #{translate("move_to_annual_billing")} div(ng-hide="upgradeComplete") diff --git a/services/web/app/views/user/activate.pug b/services/web/app/views/user/activate.pug index 7961876389..8b60b10471 100644 --- a/services/web/app/views/user/activate.pug +++ b/services/web/app/views/user/activate.pug @@ -36,7 +36,7 @@ block content placeholder="email@example.com" required, ng-model="email", - ng-init="email = #{JSON.stringify(email)}", + ng-init="email = "+JSON.stringify(email), ng-model-options="{ updateOn: 'blur' }", disabled ) diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug index 8339f27189..823299d660 100644 --- a/services/web/app/views/user/login.pug +++ b/services/web/app/views/user/login.pug @@ -19,7 +19,7 @@ block content placeholder='email@example.com', ng-model="email", ng-model-options="{ updateOn: 'blur' }", - ng-init="email = #{JSON.stringify(email)}", + ng-init="email = "+JSON.stringify(email), focus="true" ) span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty") diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index 310912cf07..a4217d8ca4 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -28,7 +28,7 @@ block content placeholder="email@example.com" required, ng-model="email", - ng-init="email = #{JSON.stringify(user.email)}", + ng-init="email = "+JSON.stringify(user.email), ng-model-options="{ updateOn: 'blur' }" ) span.small.text-primary(ng-show="settingsForm.email.$invalid && settingsForm.email.$dirty")