From 561ab2d01e059da44c0e5b34f5527fe946a1448c Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 8 Aug 2014 07:11:56 -0700 Subject: Use connect-assets for js and css --- views/layout.html | 4 ++- views/sessions/new.html | 66 ++++++++++++++++------------------------- views/transactions/index.html | 6 +--- views/users/edit.html | 9 +----- views/users/new.html | 69 ++++++++++++++++++------------------------- views/users/show.html | 10 +------ 6 files changed, 60 insertions(+), 104 deletions(-) (limited to 'views') diff --git a/views/layout.html b/views/layout.html index 4a99c7e0..651d01ef 100644 --- a/views/layout.html +++ b/views/layout.html @@ -4,12 +4,13 @@ CoinOS - + {{#css}}css/calculator{{/css}} {{{yield-styles}}} {{{yield-scripts}}}
+ {{#navigation}}
+ {{/navigation}} {{{yield}}} diff --git a/views/sessions/new.html b/views/sessions/new.html index a871e66c..cf28a9ed 100644 --- a/views/sessions/new.html +++ b/views/sessions/new.html @@ -1,46 +1,30 @@ - - - - - - CoinOS - - - - - - - - -
- +{{#yield-scripts}} + {{#css}}css/signin{{/css}} + {{#js}}js/signin{{/js}} +{{/yield-scripts}} - {{#notice}} -
-

Your Account Needs To Be Recreated

-

On May 3, 2014, our hosting provider accidentally wiped out our server and database backups, causing us to lose all of our account data. Please contact us at info@bitcoincoop.org and we'll help you get up and running again. Sorry for the inconvenience. We appreciate all the merchants who have been using our system and we've taken measures to ensure that this kind of catastrophe won't happen again.

-

-

The Bitcoin Co-op

-
- {{/notice}} + + +{{#notice}} +
+

Looks like you're trying to access a page or account that doesn't exist. We had an issue with our server in May that caused us to lose account data. Please feel free to contact us at info@coinos.io and we can help you get set up again or find what you're looking for.

+
+{{/notice}} - {{#badpw}} -

Cannot find username/password on file, please try again.

- {{/badpw}} +{{#badpw}} +

Cannot find username/password on file, please try again.

+{{/badpw}} - + -

- -

+

+ +

-

What is this?

-
- - +

What is this?

diff --git a/views/transactions/index.html b/views/transactions/index.html index 281f2292..4f13066c 100644 --- a/views/transactions/index.html +++ b/views/transactions/index.html @@ -1,9 +1,5 @@ {{#yield-scripts}} - - - - - + {{#js}}js/report{{/js}} {{/yield-scripts}}

Transactions

diff --git a/views/users/edit.html b/views/users/edit.html index fceaee7a..72399187 100644 --- a/views/users/edit.html +++ b/views/users/edit.html @@ -1,12 +1,5 @@ {{#yield-scripts}} - - - - - - - - + {{#js}}js/setup{{/js}} {{/yield-scripts}}
diff --git a/views/users/new.html b/views/users/new.html index e9874217..9d2a7aa3 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -1,41 +1,30 @@ - - - - - - Bitcoin Payment Calculator - - {{#css}}calculator{{/css}} - {{#js}}register{{/js}} - - -
- -

Register

- {{#error}} -
{{error}}
- {{/error}} -
- - -
- -
- - -
+{{#yield-scripts}} + {{#js}}js/register{{/js}} +{{/yield-scripts}} -
- - -
- -
- - -
- - -
- - +
+

Register

+ {{#error}} +
{{error}}
+ {{/error}} +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
diff --git a/views/users/show.html b/views/users/show.html index 95924789..b197ad92 100644 --- a/views/users/show.html +++ b/views/users/show.html @@ -1,13 +1,5 @@ {{#yield-scripts}} - - - - - - - - - + {{#js}}js/calculator{{/js}} {{/yield-scripts}}