Merge pull request #166 from le717/master

Remove "x" buttons from dialogs

Author: redmunds

htmlContent/ewf-browse-dialog.html

@@ -1,13 +1,13 @@
 <div class="edge-web-fonts-browse-dialog template modal hide">
     <div class="modal-header">
-        <a href="#" class="close">&times;</a>
         <h1 class="dialog-title">{{PRODUCT_NAME}}</h1>
     </div>
     <div class="modal-body">
         <div class="edge-web-fonts edge-web-fonts-browse-dialog-body"></div>
     </div>
     <div class="modal-footer">
         <span class="ewf-terms-of-use">{{{TERMS_OF_USE}}}</span>
+        <a href="#" class="dialog-button btn" data-button-id="cancel">{{CANCEL}}</a>
         <a href="#" class="dialog-button btn primary" data-button-id="ok">{{DIALOG_DONE}}</a>
     </div>
 </div>

htmlContent/ewf-howto-dialog.html

@@ -1,6 +1,5 @@
 <div class="edge-web-fonts-howto-dialog template modal hide">
     <div class="modal-header">
-        <a href="#" class="close">&times;</a>
         <h1 class="dialog-title">{{Strings.PRODUCT_NAME}}</h1>
     </div>
     <div class="modal-body">

htmlContent/ewf-include-dialog.html

@@ -1,6 +1,5 @@
 <div class="edge-web-fonts-include-dialog template modal hide">
     <div class="modal-header">
-        <a href="#" class="close">&times;</a>
         <h1 class="dialog-title">{{PRODUCT_NAME}}</h1>
     </div>
     <div class="modal-body">

main.js

@@ -223,8 +223,7 @@ define(function (require, exports, module) {
 
     function _showHowtoDialog() {
         var dlg = Dialogs.showModalDialogUsingTemplate(ewfHowtoDialogTemplate);
-        dlg.getElement().find(".close").on("click", dlg.close.bind(dlg));
-        
+
         $(".edge-web-fonts-howto-diagram").css("background-image", "-webkit-image-set(url('" + howtoDiagramURL + "') 1x, url('" + howtoDiagramHiDPIURL + "') 2x)");
     }
 
@@ -455,8 +454,7 @@ define(function (require, exports, module) {
                 }
                 editor.focus();
             });
-            dlg.getElement().find(".close").on("click", dlg.close.bind(dlg));
-            
+
             webfont.renderPicker($('.edge-web-fonts-browse-dialog.instance'));
 
             $(webfont).on("ewfFontChosen", function () {
@@ -498,7 +496,6 @@ define(function (require, exports, module) {
             } else {
                 includeString = webfont.createInclude(fontFamilies);
                 var dlg = Dialogs.showModalDialogUsingTemplate(ewfIncludeDialogTemplate);
-                dlg.getElement().find(".close").on("click", dlg.close.bind(dlg));
                 $('.instance .ewf-include-string').html(StringUtils.htmlEscape(includeString)).focus().select();
             }
         }

nls/de/strings.js

@@ -28,6 +28,7 @@ define({
     "PRODUCT_NAME"                   : "Adobe Edge Web Fonts",
 
     "DIALOG_DONE"                    : "Fertig",
+    "CANCEL"                         : "Abbrechen",
     "SEARCH_PLACEHOLDER"             : "Suchen",
     "BROWSE_FONTS_INSTRUCTIONS"      : "Suchen und wählen Sie die Schrift, die Sie in ihrem Webprojekt integrieren möchten.",
     "CODEHINT_BROWSE"                : "Web-Fonts durchsuchen...", // Needs to be short to fit in popup, but not sure about acronym

nls/fr/strings.js

@@ -28,6 +28,7 @@ define({
 	"PRODUCT_NAME": "Edge Web Fonts",
 
 	"DIALOG_DONE": "Terminé",
+	"CANCEL": "Annuler",
 	"SEARCH_PLACEHOLDER": "Rechercher",
 	"BROWSE_FONTS_INSTRUCTIONS": "Recherchez et sélectionnez la police Web que vous souhaitez inclure dans votre projet Web.",
 	"CODEHINT_BROWSE": "Parcourir les polices Web...",

nls/ja/strings.js

@@ -28,6 +28,7 @@ define({
 	"PRODUCT_NAME": "Edge Web Fonts",
 
 	"DIALOG_DONE": "完了",
+	"CANCEL": "キャンセル",
 	"SEARCH_PLACEHOLDER": "検索",
 	"BROWSE_FONTS_INSTRUCTIONS": "Web プロジェクトに追加する Web フォントを探して選択してください。",
 	"CODEHINT_BROWSE": "Web Fonts を検索...",

nls/root/strings.js

@@ -28,6 +28,7 @@ define({
     "PRODUCT_NAME"                   : "Edge Web Fonts",
 
     "DIALOG_DONE"                    : "Done",
+    "CANCEL"                         : "Cancel",
     "SEARCH_PLACEHOLDER"             : "Search",
     "BROWSE_FONTS_INSTRUCTIONS"      : "Browse for and select the web font you wish to include in your web project.",
     "CODEHINT_BROWSE"                : "Browse Web Fonts...", // Needs to be short to fit in popup, but not sure about acronym

package.json

@@ -2,7 +2,7 @@
     "name": "edge-code-web-fonts",
     "title": "Adobe Edge Web Fonts",
     "description": "Adobe Edge Web Fonts gives you access to a free, high-quality web font library made possible by contributions from Adobe, Google, and designers around the world. The fonts are served by Typekit, so you can be sure of high performance and stability.",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "keywords": [".css", ".html"],
     "homepage": "http://html.adobe.com/edge/webfonts/",
     "bugs": "https://github.com/adobe/brackets-edge-web-fonts/issues",

styles/ewf-brackets.css

@@ -21,13 +21,6 @@
  * 
  */
 
-.edge-web-fonts-browse-dialog .modal-header .close,
-.edge-web-fonts-include-dialog .modal-header .close,
-.edge-web-fonts-howto-dialog .modal-header .close {
-    margin-top: 0px;
-    line-height: 40px;
-}
-
 .edge-web-fonts-browse-dialog .modal-body {
     width: 520px;
     padding: 15px 0 15px 15px;