# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1410463621 -7200
# Node ID 828e1e7908fc15990d94dd4ea3e072cfe34d635f
# Parent  0c7070a307353425c8e25e1ebdcdae112bfebb6d# Parent  0e4f488d5fa6d945ed42cb7d86a8fdabaecafbc0
Merge from trunk

diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/AndroidManifest.xml
--- a/minesweeper/AndroidManifest.xml	Fri Aug 08 16:11:30 2014 +0200
+++ b/minesweeper/AndroidManifest.xml	Thu Sep 11 21:27:01 2014 +0200
@@ -26,7 +26,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.apidesign.demo.minesweeper"
-    android:versionCode="4"
+    android:versionCode="5"
     android:versionName="2.4" >
 
     <uses-sdk
@@ -60,4 +60,4 @@
       licensing section in Javadoc
     -->    
     <uses-permission android:name="android.permission.INTERNET" />
-</manifest>
\ No newline at end of file
+</manifest>
diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/Info.plist.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/Info.plist.xml	Thu Sep 11 21:27:01 2014 +0200
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>en</string>
+        <key>CFBundleDisplayName</key>
+        <string>Fair Mines</string>
+        <key>CFBundleExecutable</key>
+        <string>MineSweeper</string>
+        <key>CFBundleIdentifier</key>
+        <string>jst</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleName</key>
+        <string>Fair Mines</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>2.3</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>1</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>Copyright © 2014 Jaroslav Tulach. All rights reserved.</string>
+        <key>LSRequiresIPhoneOS</key>
+        <true/>
+        <key>UIDeviceFamily</key>
+        <array>
+            <integer>1</integer>
+            <integer>2</integer>
+        </array>
+        <key>UIRequiredDeviceCapabilities</key>
+        <array>
+            <string>armv7</string>
+        </array>
+        <key>UISupportedInterfaceOrientations</key>
+        <array>
+            <string>UIInterfaceOrientationPortrait</string>
+            <string>UIInterfaceOrientationLandscapeLeft</string>
+            <string>UIInterfaceOrientationLandscapeRight</string>
+            <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+    </dict>
+</plist>
diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/pom.xml
--- a/minesweeper/pom.xml	Fri Aug 08 16:11:30 2014 +0200
+++ b/minesweeper/pom.xml	Thu Sep 11 21:27:01 2014 +0200
@@ -286,7 +286,7 @@
               <dependency>
                   <groupId>org.apidesign.brwsr</groupId>
                   <artifactId>dlvkbrwsr</artifactId>
-                  <version>0.8.1</version>
+                  <version>1.0</version>
                   <type>jar</type>
               </dependency>
               <dependency>
@@ -479,7 +479,7 @@
               <dependency>
                   <groupId>org.apidesign.brwsr</groupId>
                   <artifactId>ibrwsr</artifactId>
-                  <version>0.8.1</version>
+                  <version>1.0</version>
                   <scope>runtime</scope>
               </dependency>
           </dependencies>
@@ -564,8 +564,13 @@
                                       </includes>
                                   </resource>
                               </resources>
+                               <iosInfoPList>Info.plist.xml</iosInfoPList>
                           </config>
                           <includeJFX>false</includeJFX>
+                          <!--                      
+                          <iosSignIdentity>iPhone Distribution</iosSignIdentity>
+                          <iosProvisioningProfile>9728E91B-1BB7-40D6-8922-3DD3BA5E6ECD</iosProvisioningProfile> 
+                          -->
                       </configuration>
                   </plugin>
               </plugins>
diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Fri Aug 08 16:11:30 2014 +0200
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Thu Sep 11 21:27:01 2014 +0200
@@ -23,6 +23,7 @@
  */
 package org.apidesign.demo.minesweeper;
 
+import java.util.Locale;
 import net.java.html.boot.BrowserBuilder;
 import org.netbeans.api.nbrwsr.OpenHTMLRegistration;
 import org.openide.awt.ActionID;
@@ -39,6 +40,7 @@
     public static void main(String... args) throws Exception {        
         BrowserBuilder.newBrowser().
             loadPage("pages/index.html").
+            locale(Locale.getDefault()).
             loadClass(MinesModel.class).
             invoke("main", args).
             showAndWait();
diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/src/main/webapp/pages/index.html
--- a/minesweeper/src/main/webapp/pages/index.html	Fri Aug 08 16:11:30 2014 +0200
+++ b/minesweeper/src/main/webapp/pages/index.html	Thu Sep 11 21:27:01 2014 +0200
@@ -58,15 +58,15 @@
                 </a>
                 <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: false, click: normalGame">
                     <span>&#x21bb;</span>
-                    <span class="hidden-phone">New Game!</span>
+                    <span class="info-text">New!</span>
                 </button>
-                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: giveUp ">
+                <button class="hidden-phone btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: giveUp ">
                     <span>&#x2717;</span>
-                    <span class="hidden-phone">Show Mines!</span>
+                    <span>Show Mines!</span>
                 </button>
                 <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: markMine">
                     <span>&#x26A0;</span>
-                    <span class="hidden-phone">Mark Mine!</span>
+                    <span class="info-text">Mark Mine!</span>
                 </button>
             </div>
         </div>
@@ -185,22 +185,22 @@
       <div class="caption">
         <h3>iBrwsr</h3>
         <p>
-            This application can also be packaged to run on your iPhone
-            or iPad. It is not yet available on AppStore, but it will.
+            This application has been packaged to run on your iPhone
+            or iPad and made available on AppStore.
             In this mode it
             uses <a target="_blank" href="http://www.robovm.org">RoboVM</a> 
             virtual machine to execute Java code natively.
             It uses iOS WebView to display the UI and execute
             generated JavaScript. Both these components are
             bound together via <a target="_blank" 
-                href="http://wiki.apidesign.org/wiki/IBrwsr">
+            href="http://wiki.apidesign.org/wiki/IBrwsr">
             iBrwsr</a> library.
         </p>
         <p>
-            <a href="http://wiki.apidesign.org/wiki/IBrwsr"
+            <a href="https://itunes.apple.com/us/app/fair-minesweeper/id903688146"
                target="_blank"
                class="btn btn-primary" role="button"
-               >Learn more &raquo;</a> 
+               >Install &raquo;</a> 
         </p>
       </div>
     </div>
diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/src/main/webapp/pages/index_cs.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/src/main/webapp/pages/index_cs.html	Thu Sep 11 21:27:01 2014 +0200
@@ -0,0 +1,247 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Férové miny</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link href="bootstrap.css" rel="stylesheet">
+        <link href="bootstrap-responsive.css" rel="stylesheet">
+        <link href="mines.css" rel="stylesheet">
+        <!-- Target tablets -->
+        <link href="mines-tablet-large.css" 
+              media="(min-width:640px), (min-height:660px)" 
+              rel="stylesheet" />
+        <link href="mines-tablet-small.css" 
+              media="(min-width:510px) and (max-width:640px), (min-height:520px) and (max-height:660px)" 
+              rel="stylesheet" />
+        <!-- Target phones -->
+        <link href="mines-phone-large.css" 
+              media="(min-width:410px) and (max-width:510px), (min-height:400px) and (max-height:520px)" 
+              rel="stylesheet" />
+        <link href="mines-phone-small.css" 
+              media="(min-width:300px) and (max-width:410px), (min-height:300px) and (max-height:400px)" 
+              rel="stylesheet" />
+        <link href="mines-phone-smaller.css" 
+              media="(max-width:300px), (max-height:300px)" 
+              rel="stylesheet" />
+    </head>
+    <body>
+        <div class="navbar">
+            <div class="navbar-inner">
+                <a id="apptitle" class="brand" href="#" data-bind="click: showHelp">
+                    <img height="20" width="20" src="DukeSweeper.png">
+                    <span class="hidden-phone">Miny</span>
+                </a>
+                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: false, click: normalGame">
+                    <span>&#x21bb;</span>
+                    <span class="info-text">Hra</span>
+                </button>
+                <button class="hidden-phone btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: giveUp ">
+                    <span>&#x2717;</span>
+                    <span>Vzdát</span>
+                </button>
+                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: markMine">
+                    <span>&#x26A0;</span>
+                    <span class="info-text">Označkovat</span>
+                </button>
+            </div>
+        </div>
+
+
+        <script type="text/html" id="field">
+          <center>
+              <table class="field" data-bind="css: gameStyle">
+                <tbody>
+                    <!-- ko foreach: rows -->
+                    <tr>
+                        <!-- ko foreach: columns -->
+                        <td data-bind="css: style, click: $parents[1].click" >
+                            <div></div>
+                        </td>
+                        <!-- /ko -->
+                    </tr>
+                    <!-- /ko -->
+                </tbody>
+            </table>
+          </center>
+        </script>
+
+        <div data-bind="template: { name : 'field', if: fieldShowing }"></div>
+        
+        <div class="jumbotron control-label" data-bind="visible: !fieldShowing() ">
+            <div class="container">
+                <h1>Ukázka HTML/Java technologie</h1>
+
+                <p>Na první pohled se jedná o staré dobré <em>miny</em>.
+                   Bližší pohled však odhalí revoluční technologii, jež 
+                   umožňuje programovat logiku aplikace v <strong>Javě</strong>
+                   a uživatelské rozhraní definovat v <strong>HTML</strong>.
+                   To vše na jakémkoli zařízení schopném zobrazit moderní 
+                   <strong>HTML5</strong> prohlížeč.
+                </p>
+                <p><a class="btn btn-primary btn-lg" role="button" 
+                      target="_blank" href="http://html.java.net"
+                >Navštívit stránky projektu</a>
+                </p>
+            </div>
+        </div>
+
+    <div class="container" data-bind="visible: !fieldShowing()">
+      <div>
+        <div class="col-md-4">
+          <h2>Miny</h2>
+          <p>
+              Odhalte deset políček jež skrývají miny 
+              a označte je znakem &#x26a0;.
+              Dotykem políčka se zjistí,  
+              zda-li je na něm mina či kolik min se 
+              nachází v sousedních osmi políčkách.
+              Nespoléhejte na náhodu,
+              tato verze min dokáže detekovat 
+              náhodné hádání a v takovém případě přerovnat miny.
+              Tato hra je <b>fér</b>!
+          </p>
+          <p><a class="btn btn-default" href="#" data-bind="click: normalGame"role="button">Hrát &raquo;</a></p>
+        </div>
+        <div class="col-md-4">
+          <h2>Dokumentace</h2>
+          <p>
+              Chcete-li psát aplikace jako je tato
+              (tedy používat <strong>Javu</strong> a <strong>HTML</strong>)
+              můžete se nyní dozvědět něco o knihovnách, které 
+              to umožňují. Následující odkaz Vás zavede
+              stránky s dokumentací.
+          </p>
+          <p><a class="btn btn-default"
+                target="_blank" href="http://bits.netbeans.org/html+java/"
+                role="button">Více &raquo;</a></p>
+       </div>
+        <div class="col-md-4">
+          <h2>Verze pro prohlížeč</h2>
+          <p>
+              Tato technologie je primárně určena pro
+              klasické osobní počítače či pro tablety a telefony. 
+              Přesto je však možné spustit tu samou aplikaci
+              s nezměným kódem v prohlížeči. Je k tomu potřeba
+              implementace <b>Java</b> virtuálního stroje zvaná
+              <a href="http://bck2brwsr.apidesign.org">bck2brwsr</a>.
+          </p>
+          <p><a class="btn btn-default"
+                target="_blank" href="http://xelfi.cz/minesweeper/bck2brwsr/"
+                role="button">Vyzkoušet &raquo;</a></p>
+       </div>
+      </div>
+    </div>
+<div class="container" data-bind="visible: !fieldShowing()">
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="android_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>DlvkBrwsr</h3>
+        <p>
+            Tato apliace byla přeložena pro Váš telefon se systémem Android
+            a je dostupná na  Google Play! tržišti. V této konfiguraci
+            se používá virtuální stroj Dalvik pro spouštění <b>Java</b> kódu 
+            a Androidí WebView k zobrazení uživatelského rozhraní a 
+            interpretaci generovaného JavaScriptu. Tyto komponenty jsou
+            spojeny dohromady pomocí <a href="http://wiki.apidesign.org/wiki/DlvkBrwsr">
+            DlvkBrwsr</a> technologie.
+        </p>
+        <p>
+            <a href="https://play.google.com/store/apps/details?id=org.apidesign.demo.minesweeper"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Instalovat &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="ios_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>iBrwsr</h3>
+        <p>
+            Tato aplikace byla přeložena a zabalena tak, aby běžela na
+            Vašem iPhonu
+            nebo iPadu a je dostupná na tržišti AppStore.
+            V této konfiguraci se používá
+            virtuální stroj <a target="_blank" href="http://www.robovm.org">RoboVM</a> 
+            pro přeložení <b>Java</b> kódu do nativního formátu.
+            Pro zobrazení a provádění vygenerovaného JavaScriptu
+            se využívá iOS WebView. Obě tyto komponenty jsou spojeny 
+            pomocí <a target="_blank" 
+                href="http://wiki.apidesign.org/wiki/IBrwsr">
+            iBrwsr</a> knihovny.
+        </p>
+        <p>
+            <a href="https://itunes.apple.com/us/app/fair-minesweeper/id903688146"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Instalovat &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="netbeans_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>Vyvíjejte své aplikace!</h3>
+        <p>
+            Tuto aplikace lze zabalit jako 
+            <a href="http://plugins.netbeans.org/plugin/53864/"
+               target="_blank"
+            >rozšíření pro NetBeans</a> a nebo
+            lze použít vývojové prostředí 
+            <a href="http://www.netbeans.org" target="_blank">
+            NetBeans</a> k vytvoření své vlastní aplikace,
+            jež bude využívat synergie 
+            <em>HTML</em> a <em>Javy</em>.
+            Pište své aplikace jednou a zobrazte je na 
+            každém zařízení schopném zobrazit <em>HTML</em>!
+        </p>
+        <p>
+            <a href="http://wiki.apidesign.org/wiki/DukeScriptInNetBeans"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Vyvíjejte &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+        <!-- boot bck2brwsr -->
+        <script type="text/javascript" src="bck2brwsr.js"></script>
+        <script>
+            var vm = bck2brwsr('minesweeper.js');
+            var c = vm.loadClass('org.apidesign.demo.minesweeper.MinesModel');
+            c.invoke('main');
+        </script>
+
+    </body>
+</html>
diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/src/main/webapp/pages/mines-phone-small.css
--- a/minesweeper/src/main/webapp/pages/mines-phone-small.css	Fri Aug 08 16:11:30 2014 +0200
+++ b/minesweeper/src/main/webapp/pages/mines-phone-small.css	Thu Sep 11 21:27:01 2014 +0200
@@ -51,3 +51,6 @@
 .col-md-1 {
  width: 100%;
 }
+.info-text {
+    font-size: xx-small;
+}
diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/src/main/webapp/pages/mines-phone-smaller.css
--- a/minesweeper/src/main/webapp/pages/mines-phone-smaller.css	Fri Aug 08 16:11:30 2014 +0200
+++ b/minesweeper/src/main/webapp/pages/mines-phone-smaller.css	Thu Sep 11 21:27:01 2014 +0200
@@ -52,3 +52,6 @@
 .col-md-1 {
  width: 100%;
 }
+.info-text {
+    font-size: xx-small;
+}
diff -r 0c7070a30735 -r 828e1e7908fc minesweeper/src/main/webapp/pages/mines.css
--- a/minesweeper/src/main/webapp/pages/mines.css	Fri Aug 08 16:11:30 2014 +0200
+++ b/minesweeper/src/main/webapp/pages/mines.css	Thu Sep 11 21:27:01 2014 +0200
@@ -33,6 +33,10 @@
     background-color: #fafafa;
 }
 
+table {
+    table-layout: fixed;
+}
+
 table.field {
 }
 table.field td {
@@ -106,6 +110,7 @@
 
 table.PLAYING td.UNKNOWN div::after {
     content: "\0026a0";
+    visibility: hidden;
 }
 table.field td.EXPLOSION div::after {
     content: "\002717";
@@ -118,8 +123,7 @@
 }
 table.field td.N_0 div::after {
     content: "\0026a0";
-    background-color: white;
-    color: white;
+    visibility: hidden;
 }
 table.field td.N_1 div::after {
     content: "\002780";
diff -r 0c7070a30735 -r 828e1e7908fc pom.xml
--- a/pom.xml	Fri Aug 08 16:11:30 2014 +0200
+++ b/pom.xml	Thu Sep 11 21:27:01 2014 +0200
@@ -13,7 +13,7 @@
   </parent>  
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <net.java.html.version>0.8.3</net.java.html.version>
+      <net.java.html.version>1.0</net.java.html.version>
       <nb.html.version>0.8.3</nb.html.version>
       <bck2brwsr.version>0.9</bck2brwsr.version>
       <teavm.version>0.1</teavm.version>