mirror of
https://github.com/nextcloud/nextcloudpi.git
synced 2026-01-09 14:42:01 -03:30
ncp-web: integrate ncp-wizard with ncp-web
This commit is contained in:
parent
a5ce511469
commit
bd74eb477f
@ -1,5 +1,9 @@
|
||||
|
||||
[v0.31.12](https://github.com/nextcloud/nextcloudpi/commit/487e06e) (2017-10-05) fail2ban: email notification
|
||||
[v0.31.14](https://github.com/nextcloud/nextcloudpi/commit/7e40933) (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
|
||||
|
||||
[v0.31.12](https://github.com/nextcloud/nextcloudpi/commit/f30c470) (2017-10-05) fail2ban: email notification (Closes #232)
|
||||
|
||||
[v0.31.11](https://github.com/nextcloud/nextcloudpi/commit/3fc4d3c) (2017-10-04) nc-backup: fix excludes
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
66
ncp-web/img/view-close.svg
Normal file
66
ncp-web/img/view-close.svg
Normal file
@ -0,0 +1,66 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
height="32"
|
||||
width="32"
|
||||
version="1.1"
|
||||
id="svg11"
|
||||
sodipodi:docname="view-close.svg"
|
||||
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
|
||||
<metadata
|
||||
id="metadata15">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1079"
|
||||
id="namedview13"
|
||||
showgrid="false"
|
||||
inkscape:zoom="7.375"
|
||||
inkscape:cx="-8.3389829"
|
||||
inkscape:cy="15.728814"
|
||||
inkscape:window-x="1920"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg11" />
|
||||
<defs
|
||||
id="defs5">
|
||||
<filter
|
||||
id="a"
|
||||
height="1.6"
|
||||
width="1.6"
|
||||
y="-.3"
|
||||
x="-.3"
|
||||
color-interpolation-filters="sRGB">
|
||||
<feGaussianBlur
|
||||
stdDeviation="2.239"
|
||||
id="feGaussianBlur2" />
|
||||
</filter>
|
||||
</defs>
|
||||
<path
|
||||
d="M24.955 23.538l-1.414 1.414-7.535-7.536-7.536 7.536-1.415-1.414 7.536-7.536-7.535-7.536L8.47 7.052l7.535 7.536 7.516-7.555 1.435 1.433-7.536 7.536z"
|
||||
fill="#fff"
|
||||
id="path9"
|
||||
style="fill:#4d4d4d;fill-opacity:1" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.9 KiB |
81
ncp-web/img/wizard.svg
Normal file
81
ncp-web/img/wizard.svg
Normal file
@ -0,0 +1,81 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.1"
|
||||
id="Capa_1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
width="11.274149"
|
||||
height="11.274081"
|
||||
viewBox="0 0 11.274149 11.274081"
|
||||
xml:space="preserve"
|
||||
sodipodi:docname="wizard.svg"
|
||||
inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata
|
||||
id="metadata41"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs39" /><sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1460"
|
||||
inkscape:window-height="605"
|
||||
id="namedview37"
|
||||
showgrid="false"
|
||||
inkscape:zoom="37.963182"
|
||||
inkscape:cx="5.6370744"
|
||||
inkscape:cy="5.6370405"
|
||||
inkscape:window-x="2174"
|
||||
inkscape:window-y="119"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="Capa_1" /><g
|
||||
id="g4"
|
||||
transform="matrix(0.02965879,0,0,0.02965879,4.2234053e-6,-2.5435385e-5)"
|
||||
style="fill:#ffffff"><path
|
||||
d="M 376.479,322.298 185.976,151.892 218.184,141.88 c 2.592,-0.806 4.888,-2.221 6.736,-4.069 2.408,-2.409 4.058,-5.553 4.61,-9.046 0.979,-6.176 -1.634,-12.371 -6.739,-15.981 l -49.768,-35.196 0.778,-60.951 c 0.08,-6.251 -3.396,-12.007 -8.967,-14.846 -5.572,-2.838 -12.271,-2.268 -17.282,1.471 L 98.699,39.719 40.974,20.142 c -5.92,-2.007 -12.469,-0.479 -16.89,3.941 -4.421,4.42 -5.948,10.969 -3.94,16.89 L 39.719,98.701 3.261,147.554 c -3.739,5.011 -4.309,11.71 -1.471,17.281 2.838,5.571 8.594,9.047 14.846,8.967 l 60.952,-0.779 35.196,49.769 c 3.61,5.104 9.806,7.717 15.981,6.738 6.176,-0.979 11.26,-5.377 13.115,-11.348 l 10.013,-32.208 170.408,190.502 c 2.006,2.244 4.847,3.561 7.856,3.645 0.103,0.004 0.203,0.006 0.305,0.006 2.899,0 5.687,-1.152 7.742,-3.209 l 38.718,-38.717 c 2.128,-2.127 3.286,-5.039 3.202,-8.047 -0.084,-3.008 -1.402,-5.849 -3.645,-7.856 z"
|
||||
id="path2"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff" /></g><g
|
||||
id="g6"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g8"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g10"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g12"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g14"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g16"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g18"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g20"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g22"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g24"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g26"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g28"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g30"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g32"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /><g
|
||||
id="g34"
|
||||
transform="translate(1.4239979e-4,-8.5760021e-4)" /></svg>
|
||||
|
After Width: | Height: | Size: 3.7 KiB |
@ -53,6 +53,29 @@
|
||||
?>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
if ( !file_exists( 'wizard.cfg' ) )
|
||||
{
|
||||
echo <<<HTML
|
||||
<div id="first-run-wizard">
|
||||
<div>
|
||||
<br>
|
||||
<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>
|
||||
<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="first-run-close" id="close-wizard">close</button>
|
||||
<br><br>
|
||||
</div>
|
||||
</div>
|
||||
HTML;
|
||||
touch( 'wizard.cfg' );
|
||||
}
|
||||
?>
|
||||
|
||||
<header role="banner"><div id="header">
|
||||
<div id="header-left">
|
||||
<a href="https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/"
|
||||
@ -66,6 +89,11 @@
|
||||
</a>
|
||||
</div>
|
||||
<div id="header-right">
|
||||
<div id="wizard">
|
||||
<div id="expand">
|
||||
<div id="expandDisplayName" class="icon-wizard-white"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="poweroff">
|
||||
<div id="expand">
|
||||
<div id="expandDisplayName" class="icon-power-white"></div>
|
||||
|
||||
@ -1115,9 +1115,12 @@ select {
|
||||
}
|
||||
|
||||
.icon-power-white {
|
||||
background-image: url('poweroff.svg');
|
||||
background-image: url('img/poweroff.svg');
|
||||
}
|
||||
|
||||
.icon-wizard-white {
|
||||
background-image: url('img/wizard.svg');
|
||||
}
|
||||
.icon-red-circle {
|
||||
background-image: url('red-circle.svg');
|
||||
padding: 8px;
|
||||
@ -1154,5 +1157,39 @@ a#versionlink{
|
||||
|
||||
/* lower version link */
|
||||
#header #header-left {
|
||||
align-items:baseline
|
||||
align-items:baseline
|
||||
}
|
||||
|
||||
#first-run-wizard {
|
||||
position:fixed;
|
||||
top:0;
|
||||
bottom:0;
|
||||
height:100%;
|
||||
width:100%;
|
||||
background-color:rgba(0, 0, 0, 0.5);
|
||||
z-index:9000;
|
||||
text-align:center;
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
#first-run-wizard div {
|
||||
display:block;
|
||||
background: white;
|
||||
position:relative;
|
||||
width:50%;
|
||||
top:25%;
|
||||
margin:0px auto;
|
||||
}
|
||||
|
||||
#close-wizard {
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
right: 5px;
|
||||
display: block;
|
||||
background: none;
|
||||
background-image:url('img/view-close.svg');
|
||||
width: 38px;
|
||||
height: 19px;
|
||||
text-indent: -9999px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
@ -168,11 +168,28 @@ $(function()
|
||||
}).error( errorMsg );
|
||||
} );
|
||||
|
||||
// Wizard button
|
||||
$( '#wizard' ).on('click', function(e)
|
||||
{
|
||||
window.location = 'wizard';
|
||||
} );
|
||||
|
||||
// close notification icon
|
||||
$( '.icon-close' ).on('click', function(e)
|
||||
{
|
||||
$( '#notification' ).hide();
|
||||
} );
|
||||
|
||||
// close first run box
|
||||
$( '.first-run-close' ).on('click', function(e)
|
||||
{
|
||||
$( '#first-run-wizard' ).hide();
|
||||
} );
|
||||
$( '#first-run-wizard' ).on('click', function(e)
|
||||
{
|
||||
if( e.target.id == 'first-run-wizard' )
|
||||
$( '#first-run-wizard' ).hide();
|
||||
} );
|
||||
});
|
||||
|
||||
// License
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user