diff --git a/.gitignore b/.gitignore index 94dc3faf8..c06d22ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,5 @@ js/copayBundle.js config.js webapp chrome-extension +firefox-addon version.js diff --git a/img/icons/icon-16.png b/img/icons/icon-16.png new file mode 100644 index 000000000..d4664c57a Binary files /dev/null and b/img/icons/icon-16.png differ diff --git a/img/icons/icon-32.png b/img/icons/icon-32.png new file mode 100644 index 000000000..eca42cbc5 Binary files /dev/null and b/img/icons/icon-32.png differ diff --git a/img/icons/icon-64.png b/img/icons/icon-64.png new file mode 100644 index 000000000..fec1daa73 Binary files /dev/null and b/img/icons/icon-64.png differ diff --git a/index-download-chrome.html b/index-download-chrome.html index 675112999..a5626065b 100644 --- a/index-download-chrome.html +++ b/index-download-chrome.html @@ -8,7 +8,7 @@
-

Copay Installation:

+

Copay Chrome Installation:

diff --git a/js/routes.js b/js/routes.js index 301b9d68a..5e44085eb 100644 --- a/js/routes.js +++ b/js/routes.js @@ -76,5 +76,5 @@ angular }); }) .config(function($compileProvider) { - $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel|chrome-extension):/); + $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel|chrome-extension|resource):/); }); diff --git a/popup.html b/popup.html index 99e584da6..e73f92a7f 100644 --- a/popup.html +++ b/popup.html @@ -8,12 +8,13 @@ body { background-color: #2C3E50; } a { -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; background-color: #008cba; color: #fff; display: block; font-family: "Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif; - margin: 20px 0; + margin: 20px auto; opacity: .8; outline: none; padding: 10px; diff --git a/util/generate-app-extension.sh b/util/generate-app-extension.sh index d33485b61..a5870b421 100755 --- a/util/generate-app-extension.sh +++ b/util/generate-app-extension.sh @@ -13,10 +13,12 @@ fi # Configs APPDIR="./webapp" CHROMEDIR="./chrome-extension" +FIREFOXDIR="./firefox-addon" LIBDIR="$APPDIR/lib" DOWNLOADDIR="$APPDIR/download" CHROMEDOWNLOADDIR="$DOWNLOADDIR/chrome" +FIREFOXDOWNLOADDIR="$DOWNLOADDIR/firefox" ZIPFILE="copay.zip" CHROMEZIPFILE="copay-chrome-extension.zip" @@ -50,6 +52,13 @@ fi mkdir -p $CHROMEDIR +# Create/Clean chrome-extension dir +if [ -d $FIREFOXDIR ]; then + rm -rf $FIREFOXDIR +fi + +mkdir -p $FIREFOXDIR + # Re-compile copayBundle.js echo -e "${OpenColor}${Green}* Generating copay bundle...${CloseColor}" grunt --target=dev shell @@ -65,6 +74,11 @@ echo -e "${OpenColor}${Green}* Copying all chrome-extension files...${CloseColor cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,popup.html,manifest.json} $CHROMEDIR checkOK +# Copy all firefox-addon files +echo -e "${OpenColor}${Green}* Copying all firefox-addon files...${CloseColor}" +cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,popup.html} $FIREFOXDIR +checkOK + # Zipping apps echo -e "${OpenColor}${Green}* Zipping all app files...${CloseColor}" zip -r $ZIPFILE $APPDIR @@ -76,8 +90,10 @@ zip -r $CHROMEZIPFILE $CHROMEDIR checkOK mkdir -p $CHROMEDOWNLOADDIR +mkdir -p $FIREFOXDOWNLOADDIR mv $ZIPFILE $DOWNLOADDIR mv $CHROMEZIPFILE $CHROMEDOWNLOADDIR cp index-download-chrome.html $CHROMEDOWNLOADDIR/index.html +cp index-download-firefox.html $FIREFOXDOWNLOADDIR/index.html echo -e "${OpenColor}${Yellow}\nAwesome! Now you have the webapp in ./webapp and the chrome extension files in ./webapp/download/.${CloseColor}"