renamed to NextCloudPlusv0.53.29

author: nachoparker <nacho@ownyourbits.com> 2018-04-05 19:49:05 +0300
committer: nachoparker <nacho@ownyourbits.com> 2018-04-20 15:38:58 +0300
commit: a9458f526524fee8474f67b1999d49000a0e5fbf (patch)
tree: 39041c89a908306181bf70bb9a15c1d83a3a6608 /ncp-web
parent: 0d6c780911fd2e96681834764a057985d9bf2f81 (diff)
10 files changed, 29 insertions, 28 deletions
diff --git a/ncp-web/activate/JS.js b/ncp-web/activate/JS.js
index e570b204..a46936da 100644
--- a/ncp-web/activate/JS.js
+++ b/ncp-web/activate/JS.js
@@ -1,5 +1,5 @@
 ///
-// NextcloudPi Web Panel javascript library
+// NextcloudPlus Web Panel javascript library
 //
 // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
@@ -37,7 +37,7 @@ function launch_nc_passwd()
           var url = window.location.protocol + '//' + window.location.hostname + ':4443';
           if ( !window.open( url, '_blank' ) ) // try to open in a new tab first
             window.location.replace( url );
-        }, 3500 );
+        }, 4000 );
       } else {
         $('#error-box').fill( "nc-passwd error" ); 
       }
@@ -96,7 +96,7 @@ $(function()
       input.selectionStart = input.selectionEnd;
     } );
 
-  // activate NextCloudPi
+  // activate NextCloudPlus
   $( '#activate-ncp' ).on( 'click', function(e)
   {
     $( '#activate-ncp' ).hide();
diff --git a/ncp-web/activate/index.php b/ncp-web/activate/index.php
index f1fb697b..bc31bf5c 100644
--- a/ncp-web/activate/index.php
+++ b/ncp-web/activate/index.php
@@ -44,6 +44,7 @@
              <button type="button" id="print-pwd"   > Print    </button>
              <button type="button" id="activate-ncp"> Activate </button>
           </p>
+<br>
           <img id="loading-gif" src="../img/loading-small.gif">
           <div id="error-box"></div>
 HTML;
diff --git a/ncp-web/csrf.php b/ncp-web/csrf.php
index 68574599..c65653c2 100644
--- a/ncp-web/csrf.php
+++ b/ncp-web/csrf.php
@@ -1,6 +1,6 @@
 <?php
 ///
-// NextcloudPi Web Panel CSRF protection library
+// NextcloudPlus Web Panel CSRF protection library
 //
 // Inspired by http://blog.ircmaxell.com/2013/02/preventing-csrf-attacks.html
 //
diff --git a/ncp-web/index.php b/ncp-web/index.php
index 0764f720..59cd808d 100644
--- a/ncp-web/index.php
+++ b/ncp-web/index.php
@@ -1,5 +1,5 @@
 <!--
- NextcloudPi Web Panel frontend
+ NextcloudPlus Web Panel frontend
 
  Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  GPL licensed (see end of file) * Use at your own risk!
@@ -11,7 +11,7 @@
 <html class="ng-csp" data-placeholder-focus="false" lang="en">
 <head>
     <meta charset="utf-8">
-    <title>NextCloudPi Panel</title>
+    <title>NextCloudPlus Panel</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="referrer" content="never">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
@@ -26,7 +26,7 @@
     session_start();
 
     include('sidebar.php');
-    $modules_path = '/usr/local/etc/nextcloudpi-config.d/';
+    $modules_path = '/usr/local/etc/ncp-config.d/';
     $l10nDir = "l10n";
 
     // security headers
@@ -86,7 +86,7 @@
     <div id="first-run-wizard">
       <div class='dialog'>
         <br><br>
-        <h2 id="config-box-title">NextCloudPi First Run</h2>
+        <h2 id="config-box-title">NextCloudPlus First Run</h2>
         <p>Click to start the configuration wizard</p>
         <br>
         <a href="wizard"><img class="wizard-btn" src="wizard/img/ncp-logo.svg" class="wizard"></a>
@@ -104,9 +104,9 @@ HTML;
 
   <header role="banner"><div id="header">
     <div id="header-left">
-      <a href="https://ownyourbits.com" id="nextcloudpi" target="_blank" tabindex="1">
+      <a href="https://ownyourbits.com" id="nextcloudplus" target="_blank" tabindex="1">
         <div class="logo-icon">
-           <h1 class="hidden-visually">NextCloudPi</h1>
+           <h1 class="hidden-visually">NextCloudPlus</h1>
         </div>
       </a>
       <a id=versionlink target="_blank" href="https://github.com/nextcloud/nextcloudpi/blob/master/changelog.md">
diff --git a/ncp-web/l10n/de.json b/ncp-web/l10n/de.json
index 59684a9e..2de6cd1e 100644
--- a/ncp-web/l10n/de.json
+++ b/ncp-web/l10n/de.json
@@ -5,5 +5,5 @@
   "run": "Ausführen",
   "skip": "&Uuml;berspringen",
   "close": "Schlie&szlig;en",
-  "Configure NextCloudPi features": "NextCloudPi Funktionen konfigurieren"
+  "Configure NextCloudPlus features": "NextCloudPlus Funktionen konfigurieren"
 }}
diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php
index ad1ce062..6062b765 100644
--- a/ncp-web/ncp-launcher.php
+++ b/ncp-web/ncp-launcher.php
@@ -1,6 +1,6 @@
 <?php 
 ///
-// NextcloudPi Web Panel backend
+// NextcloudPlus Web Panel backend
 //
 // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
@@ -11,7 +11,7 @@
 include ('csrf.php');
 
 session_start();
-$modules_path = '/usr/local/etc/nextcloudpi-config.d/';
+$modules_path = '/usr/local/etc/ncp-config.d/';
 $l10nDir = "l10n";
 ignore_user_abort( true );
 
@@ -32,7 +32,7 @@ if ( $_POST['action'] == "cfgreq" )
   if ( empty($token) || !validateCSRFToken($token) )
     exit( '{ "output": "Unauthorized request. Try reloading the page" }' );
 
-  $path  = '/usr/local/etc/nextcloudpi-config.d/';
+  $path  = '/usr/local/etc/ncp-config.d/';
   $files = array_diff(scandir($path), array('.', '..'));
 
   $fh    = fopen( $path . $_POST['ref'] . '.sh' ,'r')
@@ -99,7 +99,7 @@ else if ( $_POST['action'] == "launch" && $_POST['config'] )
   if ( empty($token) || !validateCSRFToken($token) )
     exit( '{ "output": "Unauthorized request. Try reloading the page" }' );
 
-  chdir('/usr/local/etc/nextcloudpi-config.d/');
+  chdir('/usr/local/etc/ncp-config.d/');
 
   $file = $_POST['ref'] . '.sh';
 
diff --git a/ncp-web/ncp.css b/ncp-web/ncp.css
index 957a2a5c..8e29f837 100644
--- a/ncp-web/ncp.css
+++ b/ncp-web/ncp.css
@@ -1,5 +1,5 @@
 /* 
- * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
+ * NextcloudPlus Web Panel style sheets. Based on official Nextcloud 12 datasheets
  *
  * Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  * GPL licensed (see end of file) * Use at your own risk!
@@ -389,7 +389,7 @@ input[type='checkbox'].checkbox--white:indeterminate:disabled + label:after,inpu
  padding-right:20px
 }
 
-#nextcloudpi {
+#nextcloudplus {
  padding:5px;
  padding-bottom:0;
  height:45px;
@@ -397,11 +397,11 @@ input[type='checkbox'].checkbox--white:indeterminate:disabled + label:after,inpu
  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
  opacity:1
 }
-#nextcloudpi:focus {
+#nextcloudplus:focus {
  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
  opacity:0.75
 }
-#nextcloudpi:hover,#nextcloudpi:active {
+#nextcloudplus:hover,#nextcloudplus:active {
  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
  opacity:1
 }
diff --git a/ncp-web/ncp.js b/ncp-web/ncp.js
index 51f139f9..b56f7b7a 100644
--- a/ncp-web/ncp.js
+++ b/ncp-web/ncp.js
@@ -1,5 +1,5 @@
 ///
-// NextcloudPi Web Panel javascript library
+// NextcloudPlus Web Panel javascript library
 //
 // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/sidebar.php b/ncp-web/sidebar.php
index 51351b59..06ec51e0 100644
--- a/ncp-web/sidebar.php
+++ b/ncp-web/sidebar.php
@@ -12,7 +12,7 @@
 
 function print_sidebar( $l /* translations l10n object */, $ticks /* wether to calculate ticks(slow) */ )
 {
-  $modules_path = '/usr/local/etc/nextcloudpi-config.d/';
+  $modules_path = '/usr/local/etc/ncp-config.d/';
   $files = array_diff(scandir($modules_path), array('.', '..', 'nc-wifi.sh', 'nc-info.sh', 'l10n'));
   $ret   = "";
 
@@ -23,7 +23,7 @@ function print_sidebar( $l /* translations l10n object */, $ticks /* wether to c
     $active = "";
     if ( $ticks ) {
       $etc = '/usr/local/etc';
-      exec("bash -c \"source $etc/library.sh && is_active_script $etc/nextcloudpi-config.d/$script\".sh", $output, $retval);
+      exec("bash -c \"source $etc/library.sh && is_active_script $etc/ncp-config.d/$script\".sh", $output, $retval);
       if ($retval == 0)
         $active = " ✓";
     } else if (preg_match('/^ACTIVE_=yes$/m', $txt, $matches))
diff --git a/ncp-web/wizard/index.php b/ncp-web/wizard/index.php
index b96e6839..2e99727d 100644
--- a/ncp-web/wizard/index.php
+++ b/ncp-web/wizard/index.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>NextCloudPi Wizard</title>
+		<title>NextCloudPlus Wizard</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<!-- Bootstrap -->
@@ -40,7 +40,7 @@
 		<!-- Tab 1 content - Welcome -->
 		<div class="tab-pane" id="tab1">
 			<div class="ncp-tab-pane">
-				<h1>Welcome to NextCloudPi</h1>
+				<h1>Welcome to NextCloudPlus</h1>
                 <img id="ncp-welcome-logo" src="img/ncp-logo.svg">
 				<p>This wizard will help you configure your personal cloud.</p>
 			</div>
@@ -64,7 +64,7 @@
 				<!-- Format USB drive -->
 				<div class="ncp-hidden" id="format-usb">
 					<p class="instructions">
-						If you want to prepare the USB drive to be used with NextCloudPi hit Format USB. Skip if already formated as ext4.
+						If you want to prepare the USB drive to be used with NextCloudPlus hit Format USB. Skip if already formated as ext4.
 						<br>	
 						<strong>Attention!</strong> This will format your USB drive as ext4 and <strong>will destroy any current data.</strong> 
 					</p>
@@ -94,7 +94,7 @@
                     <h3>Port forwarding</h3>
                     <p class="instructions">
                         To access from the outside, your need to forward ports 80 and 443 to your RPi IP address <br>
-                        You can have NextCloudPi try to do this automatically for you<br>
+                        You can have NextCloudPlus try to do this automatically for you<br>
                         To do it manually yourself, you must access your router interface, usually at <a href="http://192.168.1.1" target="_blank">http://192.168.1.1</a><br>
                     </p>
                     <div class="buttons-area">
@@ -183,7 +183,7 @@
           <!-- Tab 4 content - Finish -->
           <div class="tab-pane" id="tab4">
               <div class="ncp-tab-pane">
-                  <p class="instructions"> NextCloudPi is ready!</p>
+                  <p class="instructions"> NextCloudPlus is ready!</p>
 
                   <div class="linkbox">
                     <a id='gotonextcloud' href="#"><img id="nextcloud" src="img/nc-logo.png"></a>
@@ -191,7 +191,7 @@
                   </div>
                   <div class="linkbox">
                     <a href=".."><img id="ncp-web" src="img/ncp-logo.svg"></a>
-                    <br>go back to NextCloudPi web panel
+                    <br>go back to NextCloudPlus web panel
                   </div>
 
               </div>
author	nachoparker <nacho@ownyourbits.com>	2018-04-05 19:49:05 +0300
committer	nachoparker <nacho@ownyourbits.com>	2018-04-20 15:38:58 +0300
commit	a9458f526524fee8474f67b1999d49000a0e5fbf (patch)
tree	39041c89a908306181bf70bb9a15c1d83a3a6608 /ncp-web
parent	0d6c780911fd2e96681834764a057985d9bf2f81 (diff)