From 1f9f8646879bc4e7baf35eb3ea18419dc02e2a87 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Fri, 30 May 2014 11:30:01 -0300 Subject: [PATCH 1/4] new webapp organization --- .gitignore | 1 + webapp/build.sh | 7 ++++--- webapp/index-download-chrome.html | 6 +++--- webapp/index-download-firefox.html | 7 ++++--- webapp/index-download.html | 21 +++++++++++++++++++++ 5 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 webapp/index-download.html diff --git a/.gitignore b/.gitignore index 13cc4e950..eef4079b1 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ js/copayBundle.js config.js webapp/webapp +webapp/download chrome/copay-chrome-extension chrome/copay-chrome-extension.zip firefox/firefox-addon diff --git a/webapp/build.sh b/webapp/build.sh index 351751a15..1a2023aca 100644 --- a/webapp/build.sh +++ b/webapp/build.sh @@ -18,11 +18,11 @@ checkOK() { # Configs BUILDDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -APPDIR="$BUILDDIR/webapp" +APPDIR="$BUILDDIR/copay-webapp" ZIPFILE="copay.zip" -VERSION=`git describe --tags --abbrev=0 | cut -c 2-` +VERSION=`cut -d '"' -f2 $BUILDDIR/../version.js` -DOWNLOADDIR="$APPDIR/download" +DOWNLOADDIR="$BUILDDIR/download" CHROMEDOWNLOADDIR="$DOWNLOADDIR/chrome" FIREFOXDOWNLOADDIR="$DOWNLOADDIR/firefox" ZIPFILE="copay.zip" @@ -61,5 +61,6 @@ mkdir -p $FIREFOXDOWNLOADDIR mv $ZIPFILE $DOWNLOADDIR cp "$BUILDDIR/index-download-chrome.html" $CHROMEDOWNLOADDIR/index.html cp "$BUILDDIR/index-download-firefox.html" $FIREFOXDOWNLOADDIR/index.html +cp "$BUILDDIR/index-download.html" $DOWNLOADDIR/index.html echo "${OpenColor}${Yellow}\nAwesome! We have a brand new Webapp, enjoy it!${CloseColor}" diff --git a/webapp/index-download-chrome.html b/webapp/index-download-chrome.html index a5626065b..5c6c1c118 100644 --- a/webapp/index-download-chrome.html +++ b/webapp/index-download-chrome.html @@ -9,14 +9,14 @@

Copay Chrome Installation:

- +
diff --git a/webapp/index-download-firefox.html b/webapp/index-download-firefox.html index 0e23e2c1d..5d8f02064 100644 --- a/webapp/index-download-firefox.html +++ b/webapp/index-download-firefox.html @@ -9,10 +9,11 @@

Copay Firefox Installation:

- +
diff --git a/webapp/index-download.html b/webapp/index-download.html new file mode 100644 index 000000000..8d253dd14 --- /dev/null +++ b/webapp/index-download.html @@ -0,0 +1,21 @@ + + + + + + Copay Download + + + +
+

Copay Installation:

+
    +
  1. Download the ZIP
    2. +
  2. Unpack the ZIP file
    3. +
  3. Enter to "copay-webapp" folder
    4. +
  4. Open the index.html with your browser (Chrome, Firefox, Opera)
    5. +
  5. Enjoy Copay!
    6. +
+
+ + From a84d6298ce72a01f2449b32e09883d4e74f052f0 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Fri, 30 May 2014 11:30:01 -0300 Subject: [PATCH 2/4] new webapp organization --- .gitignore | 1 + webapp/build.sh | 7 ++++--- webapp/index-download-chrome.html | 6 +++--- webapp/index-download-firefox.html | 7 ++++--- webapp/index-download.html | 21 +++++++++++++++++++++ 5 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 webapp/index-download.html diff --git a/.gitignore b/.gitignore index 13cc4e950..eef4079b1 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ js/copayBundle.js config.js webapp/webapp +webapp/download chrome/copay-chrome-extension chrome/copay-chrome-extension.zip firefox/firefox-addon diff --git a/webapp/build.sh b/webapp/build.sh index 351751a15..1a2023aca 100644 --- a/webapp/build.sh +++ b/webapp/build.sh @@ -18,11 +18,11 @@ checkOK() { # Configs BUILDDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -APPDIR="$BUILDDIR/webapp" +APPDIR="$BUILDDIR/copay-webapp" ZIPFILE="copay.zip" -VERSION=`git describe --tags --abbrev=0 | cut -c 2-` +VERSION=`cut -d '"' -f2 $BUILDDIR/../version.js` -DOWNLOADDIR="$APPDIR/download" +DOWNLOADDIR="$BUILDDIR/download" CHROMEDOWNLOADDIR="$DOWNLOADDIR/chrome" FIREFOXDOWNLOADDIR="$DOWNLOADDIR/firefox" ZIPFILE="copay.zip" @@ -61,5 +61,6 @@ mkdir -p $FIREFOXDOWNLOADDIR mv $ZIPFILE $DOWNLOADDIR cp "$BUILDDIR/index-download-chrome.html" $CHROMEDOWNLOADDIR/index.html cp "$BUILDDIR/index-download-firefox.html" $FIREFOXDOWNLOADDIR/index.html +cp "$BUILDDIR/index-download.html" $DOWNLOADDIR/index.html echo "${OpenColor}${Yellow}\nAwesome! We have a brand new Webapp, enjoy it!${CloseColor}" diff --git a/webapp/index-download-chrome.html b/webapp/index-download-chrome.html index a5626065b..5c6c1c118 100644 --- a/webapp/index-download-chrome.html +++ b/webapp/index-download-chrome.html @@ -9,14 +9,14 @@

Copay Chrome Installation:

-
    -
  • Download ZIP
    • +
      +
    1. Download the ZIP
    2. Unpack the ZIP file
    3. Navigate to "chrome://extensions" in your browser
    4. Enable Developer Mode
    5. Click "Load unpacked extension" and select the unzipped folder
    6. Copay is installed!
      7. -
+
diff --git a/webapp/index-download-firefox.html b/webapp/index-download-firefox.html index 0e23e2c1d..5d8f02064 100644 --- a/webapp/index-download-firefox.html +++ b/webapp/index-download-firefox.html @@ -9,10 +9,11 @@

Copay Firefox Installation:

-
    -
  • Download XPI
    • +
      +
    1. Download the XPI
      2. +
    2. Install the XPI file in Firefox from Addons sections
    3. Copay is installed!
      4. -
+
diff --git a/webapp/index-download.html b/webapp/index-download.html new file mode 100644 index 000000000..8d253dd14 --- /dev/null +++ b/webapp/index-download.html @@ -0,0 +1,21 @@ + + + + + + Copay Download + + + +
+

Copay Installation:

+
    +
  1. Download the ZIP
    2. +
  2. Unpack the ZIP file
    3. +
  3. Enter to "copay-webapp" folder
    4. +
  4. Open the index.html with your browser (Chrome, Firefox, Opera)
    5. +
  5. Enjoy Copay!
    6. +
+
+ + From eced97c4d030a62f56c73feab9b86de3984eaf16 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Fri, 30 May 2014 11:43:38 -0300 Subject: [PATCH 3/4] relative csss --- webapp/index-download-chrome.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index-download-chrome.html b/webapp/index-download-chrome.html index 5c6c1c118..70407ae70 100644 --- a/webapp/index-download-chrome.html +++ b/webapp/index-download-chrome.html @@ -4,7 +4,7 @@ Copay Chrome Extension - Install - +
From 61d759eeb23e2398c3f65bfa90a0af819bf500dc Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Fri, 30 May 2014 11:45:07 -0300 Subject: [PATCH 4/4] relative routes for css --- webapp/index-download-chrome.html | 2 +- webapp/index-download.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/index-download-chrome.html b/webapp/index-download-chrome.html index 70407ae70..5c6c1c118 100644 --- a/webapp/index-download-chrome.html +++ b/webapp/index-download-chrome.html @@ -4,7 +4,7 @@ Copay Chrome Extension - Install - +
diff --git a/webapp/index-download.html b/webapp/index-download.html index 8d253dd14..e267c21ee 100644 --- a/webapp/index-download.html +++ b/webapp/index-download.html @@ -4,7 +4,7 @@ Copay Download - +