wizard: chain configurations and improved feedback

nextcloud · Oct 27, 2017 · 1968d88 · 1968d88
1 parent 19a10a0
commit 1968d88
Show file tree

Hide file tree

Showing 11 changed files with 461 additions and 274 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,19 @@
 
-[v0.31.15](https://github.com/nextcloud/nextcloudpi/commit/ca48e82) (2017-10-19) ncp-web: improve password prompt permissions
+[v0.31.22](https://github.com/nextcloud/nextcloudpi/commit/0c7a7b8) (2017-10-25) wizard: chain configurations and improved feedback
 
-[v0.31.14](https://github.com/nextcloud/nextcloudpi/commit/2217045) (2017-10-09) ncp-web: integrate ncp-wizard with ncp-web
+[v0.31.20](https://github.com/nextcloud/nextcloudpi/commit/df86a6f) (2017-10-26) nc-notify-updates: fix repeated lines
+
+[v0.31.19](https://github.com/nextcloud/nextcloudpi/commit/7fb7e07) (2017-10-25) samba: disable homes share by default
+
+[v0.31.18](https://github.com/nextcloud/nextcloudpi/commit/d958f0e) (2017-10-25) letsencrypt: fix return value
+
+[v0.31.17](https://github.com/nextcloud/nextcloudpi/commit/81e8066) (2017-10-25) noip: make possible to reconfigure while running
+
+[v0.31.16](https://github.com/nextcloud/nextcloudpi/commit/12e7a1d) (2017-10-22) freeDNS: fix periodic update typo
+
+[v0.31.15](https://github.com/nextcloud/nextcloudpi/commit/cfd99d6) (2017-10-19) ncp-web: improve password prompt permissions
+
+[v0.31.14](https://github.com/nextcloud/nextcloudpi/commit/5e8dba5) (2017-10-09) ncp-web: integrate ncp-wizard with ncp-web
 
 [v0.31.13](https://github.com/nextcloud/nextcloudpi/commit/583d1b6) (2017-10-07) letsencrypt: fix workaround for old images
 
@@ -15,7 +27,7 @@
 
 [v0.31.8 ](https://github.com/nextcloud/nextcloudpi/commit/03f39b2) (2017-09-30) ncp-web: small fixes
 
-[v0.31.7, tag: v0.31.17](https://github.com/nextcloud/nextcloudpi/commit/2601df3) (2017-10-03) letsencrypt: dont change config if not successful
+[v0.31.7 ](https://github.com/nextcloud/nextcloudpi/commit/2601df3) (2017-10-03) letsencrypt: dont change config if not successful
 
 [v0.31.6 ](https://github.com/nextcloud/nextcloudpi/commit/7a95cc1) (2017-10-03) letsencrypt: fix external bug (Closes #230)
 

diff --git a/ncp-web/img/menu.svg b/ncp-web/img/menu.svg
diff --git a/ncp-web/index.php b/ncp-web/index.php
@@ -66,10 +66,10 @@
         <h2 id="config-box-title">NextCloudPi First Run</h2>
         <p>Click to start the configuration wizard</p>
         <br>
-        <a href="wizard"><img id="ncp-welcome-logo" src="wizard/img/ncp-logo.png" class="wizard"></a>
+        <a href="wizard"><img class="wizard-btn" src="wizard/img/ncp-logo.png" class="wizard"></a>
         <br>
-        <a href="wizard"><button type="button" class="wizard">run</button></a>
-        <button type="button" class="first-run-close" id="skip-wizard">skip</button>
+        <button type="button" class="wizard-btn"      id="go-wizard"   >run  </button>
+        <button type="button" class="first-run-close" id="skip-wizard" >skip </button>
         <button type="button" class="first-run-close" id="close-wizard">close</button>
         <br><br>
       </div>
@@ -92,14 +92,14 @@
       </a>
     </div>
     <div id="header-right">
-      <div id="wizard">
+      <div class="wizard-btn">
         <div id="expand">
-          <div id="expandDisplayName" class="icon-wizard-white"></div>
+          <div class="icon-wizard-white"></div>
         </div>
       </div>
       <div id="poweroff">
         <div id="expand">
-          <div id="expandDisplayName" class="icon-power-white"></div>
+          <div class="icon-power-white"></div>
         </div>
       </div>
     </div>

diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php
@@ -99,6 +99,7 @@
 
   // Get new token
   echo '{ "token": "' . getCSRFToken() . '",';
+  echo ' "ref": "' . $_POST['ref']  . '",';
   echo ' "output": "" , ';
   echo ' "ret": ';
 

diff --git a/ncp-web/ncp.css b/ncp-web/ncp.css
@@ -1193,3 +1193,7 @@ a#versionlink{
   text-indent: -9999px;
   border: none;
 }
+
+#wizard-btn {
+  cursor: pointer;
+}
diff --git a/ncp-web/ncp.js b/ncp-web/ncp.js
@@ -169,7 +169,7 @@ $(function()
   } );
 
   // Wizard button
-  $( '#wizard' ).on('click', function(e)
+  $( '.wizard-btn' ).on('click', function(e)
   {
     window.location = 'wizard';
   } );

diff --git a/ncp-web/wizard/CSS/wizard.css b/ncp-web/wizard/CSS/wizard.css
@@ -1,62 +1,63 @@
 body {
-	padding-top: 60px;
-	padding-bottom: 40px;
+  padding-top: 60px;
+  padding-bottom: 40px;
 }
+
+a:hover, a:active, a:link {
+  outline: 0px none;
+}
+
 .sidebar-nav {
-	padding: 9px 0;
+  padding: 9px 0;
 }
 #rootwizard {
-	width: 100%;
+  width: 100%;
 }
 #ncp-nav {
-	display: table;
-	margin: 0 auto;
+  display: table;
+  margin: 0 auto;
 }
 #bar {
-	margin: 5px 0 0 0;
+  margin: 5px 0 0 0;
 }
 .ncp-tab-pane {
-	display: table;
-	margin: 0 auto;
+  display: table;
+  margin: 0 auto;
 }
 .ncp-tab-pane p {
-	text-align: center;
+  text-align: center;
 }
-.ncp-tab-pane h1 {
-	text-align: center;
+.ncp-tab-pane h1, h3 {
+  text-align: center;
 }
 .tab-pane {
-	width: 100%;
+  width: 100%;
 }
 
 #ncp-pager {
-	width: 50%;
-	margin: 0 auto;
+  width: 50%;
+  margin: 0 auto;
 }
 .previous {
-	float: left;
+  float: left;
 }
 .next {
-	float: right;
+  float: right;
 }
 .ncp-hidden {
-	display: none;
+  display: none;
 }
 .instructions {
-	padding: 20px;
-	text-align: center;
+  padding: 20px;
+  text-align: center;
 }
 .buttons-area {
-	display: table;
-margin: 0 auto;
+  display: table;
+  margin: 0 auto;
 }
 
-.ddns-form form {
-	display: table;
-	text-align: center;
-}
 .btn {
-	margin:5px 0;
+  margin:5px 0;
 }
 
 div.linkbox {
@@ -65,7 +66,85 @@ div.linkbox {
   text-align: center;
 }
 
+.expand {
+  position: relative;
+  display: flex;
+  align-items: center;
+  padding: 7px 20px 6px 10px;
+  cursor: pointer;
+}
+
+.menu-icon {
+  background-repeat: no-repeat;
+  background-position: center;
+  min-width: 16px;
+  min-height: 16px;
+  background-image:url("../../../img/menu.svg");
+}
+
 #ncp-welcome-logo {
+  cursor: pointer;
   display: block;
   margin: 0 auto;
 }
+
+#notifications{
+  position: fixed;
+  bottom: 0;
+  right: 0;
+}
+
+.notification {
+  color: white;
+  padding: 10px 15px;
+  margin: 5px;
+  border-radius: 4px;
+  width: 20em;
+  text-align: center;
+}
+
+.green-bg {
+  background-color: green;
+}
+
+.orange-bg {
+  background-color: darkorange;
+}
+
+.gray-bg {
+  background-color: lightgray;
+}
+
+#output-wrapper {
+  position:fixed;
+  top:0;
+  bottom:0;
+  height:100%;
+  width:100%;
+  z-index:9000;
+  text-align:center;
+  cursor:pointer;
+}
+
+#output-box {
+  display:block;
+  background: white;
+  position:relative;
+  width:40em;
+  height:100%;
+}
+
+#output-btn {
+  position:fixed;
+  top:5px;
+  left:5px;
+}
+
+td {
+  width: 7em;
+}
+
+.buttons-area label{
+  margin: 0;
+  font-weight: 100;
+};