Win2buntu

Merge lp:~whosdaz/win2buntu/dev into lp:win2buntu

  1. dev
  2. Merge into trunk
Proposed by Matthew Allen
Status: Merged
Merged at revision: 7
Proposed branch: lp:~whosdaz/win2buntu/dev
Merge into: lp:win2buntu
Diff against target: 422 lines (+214/-133)
8 files modified
css/buttons.css (+2/-2)
css/default.css (+6/-1)
css/terminal.css (+2/-2)
index.html (+0/-65)
notLinux.html (+0/-63)
pages/installing.html (+62/-0)
pages/notLinux.html (+57/-0)
win2buntu.html (+85/-0)
To merge this branch: bzr merge lp:~whosdaz/win2buntu/dev
Reviewer Review Type Date Requested Status
Matthew Allen Approve
Review via email: mp+284512@code.launchpad.net

Description of the change

View commit message

To post a comment you must log in.
Revision history for this message
Matthew Allen (whosdaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'css/buttons.css'
2--- css/buttons.css 2016-01-29 07:59:30 +0000
3+++ css/buttons.css 2016-01-30 11:55:05 +0000
4@@ -5,8 +5,8 @@
5 float: left;
6 }
7 .button {
8- background-color: #d0ccc8;
9- color: #000;
10+ background-color: #333333;
11+ color: #fff;
12 border: 1px solid black;
13 width: 49%;
14 height: 25px;
15
16=== modified file 'css/default.css'
17--- css/default.css 2016-01-29 07:59:30 +0000
18+++ css/default.css 2016-01-30 11:55:05 +0000
19@@ -14,7 +14,7 @@
20 background-color: #EEEDEB;
21 margin: auto;
22 width: 400px;
23- height: 600px;
24+ height: 575px;
25 padding: 10px;
26 margin-top: 20px;
27 -webkit-box-shadow: 0 0 250px #636363;
28@@ -34,3 +34,8 @@
29 img {
30 width: 100%;
31 }
32+
33+iframe {
34+ width: 100%;
35+ height: 97%;
36+}
37
38=== modified file 'css/terminal.css'
39--- css/terminal.css 2016-01-29 07:59:30 +0000
40+++ css/terminal.css 2016-01-30 11:55:05 +0000
41@@ -1,7 +1,6 @@
42 .terminal {
43 color: #AEA79F;
44 height: 490px;
45- margin-bottom: 10px;
46 overflow:hidden;
47 }
48 .terminal-header {
49@@ -15,8 +14,9 @@
50 .terminal-body {
51 background-color: #333333;
52 padding: 10px;
53+ padding-bottom: -10px;
54 overflow-y: scroll;
55- height: 474px;
56+ height: 454px;
57 }
58 .terminal-command {
59 font-family: Ubuntu Mono, monospace;
60
61=== removed file 'index.html'
62--- index.html 2016-01-29 07:59:30 +0000
63+++ index.html 1970-01-01 00:00:00 +0000
64@@ -1,65 +0,0 @@
65-<html>
66-
67-<head>
68- <title> Win2buntu </title>
69- <meta charset="ISO-8859-1">
70- <link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
71-
72- <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
73- <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
74-
75- <script>
76- isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
77-
78- if(!isLinux){
79- window.location.replace("notLinux.html");
80- }
81- </script>
82-
83- <!--- Load ubuntu UI -->
84- <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
85-
86- <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
87- <!-- [...] -->
88- <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
89- <!--- End load ubuntu UI -->
90-
91- <!--- Load custom css to override Ubuntu UI -->
92- <link rel="stylesheet" type="text/css" href="css/default.css">
93- <link rel="stylesheet" type="text/css" href="css/terminal.css">
94- <link rel="stylesheet" type="text/css" href="css/buttons.css">
95-</head>
96-
97-<body>
98-
99- <div class="content">
100- <h2> Installing applications<hr></h2>
101- <div class="terminal">
102- <div class="terminal-header">
103- Terminal
104- </div>
105- <div class="terminal-body">
106- <!-- Add apt section -->
107- <p class="terminal-comment"> The command shown below allows you to add the Numix PPA, this will allow you to install packages developed and published by Numix.</p>
108- <p class="terminal-command"> $ sudo add-apt-repository ppa:numix/ppa</p>
109-
110- <!-- Authentication section -->
111- <p class="terminal-comment"> As soon as you execute this command by pressing ENTER, you will be prompted by sudo to enter your password as shown below. Sudo is the Linux equivalent of running as Admin and is required to executing many commands that make changes to the system. Be aware that as you type your password it will not show up in the terminal. </p>
112- <p class="terminal-output"> [sudo] password for $yourname: </p>
113-
114- <p class="terminal-comment"> Once you've entered your password you will be prompted to confirm or deny the addition of this PPA. PPA is short for Personal Package Archive, this package archives are used to install new software packages. By default Ubuntu has a number of PPA configured which allow you to install a vast amount of software; however some packages are not and thus have to be added manually.</p>
115-
116- <!-- Update and install section -->
117- <p class="terminal-command"> $ sudo apt-get update</p>
118- <p class="terminal-command"> $ sudo apt-get install numix-gtk-theme numix-icon-theme-circle </p>
119- <p class="terminal-comment"> /* do this thing */</p>
120- </div>
121- </div>
122- <div class="buttons">
123- <button class="button button-back" type="button">&#9664; Previous</button>
124- <button class="button button-next" type="button">Next &#9654;</button>
125- </div>
126- </div>
127-</body>
128-
129-</html>
130\ No newline at end of file
131
132=== removed file 'notLinux.html'
133--- notLinux.html 2016-01-29 07:59:30 +0000
134+++ notLinux.html 1970-01-01 00:00:00 +0000
135@@ -1,63 +0,0 @@
136-<html>
137-
138-<head>
139- <title> Win2buntu </title>
140- <meta charset="ISO-8859-1">
141- <link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
142-
143- <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
144- <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
145-
146- <script>
147- isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
148-
149- if(isLinux){
150- //Redirect uses if they somehow get to this page on Linux, disabled while developing
151- //window.location.replace("index.html");
152- }
153- </script>
154-
155- <!--- Load ubuntu UI -->
156- <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
157-
158- <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
159- <!-- [...] -->
160- <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
161- <!--- End load ubuntu UI -->
162-
163-
164- <!--- Load custom css to override Ubuntu UI -->
165- <link rel="stylesheet" type="text/css" href="css/default.css">
166- <link rel="stylesheet" type="text/css" href="css/terminal.css">
167- <link rel="stylesheet" type="text/css" href="css/buttons.css">
168-</head>
169-
170-<body>
171-
172- <div class="content">
173- <h2 class="title"> Not Linux...<hr></h2>
174- <div class="terminal full-height">
175- <div class="terminal-header">
176- Terminal
177- </div>
178- <div class="terminal-body">
179- <!-- Add apt section -->
180- <p class="terminal-comment"> It appears as if you have not installed Ubuntu yet, please install it before you continue with this guide</p>
181- <p class="terminal-command"> <a href="http://askubuntu.com/questions/6328/how-do-i-install-ubuntu">Click here to find out how</a></p>
182-
183- <!-- Authentication section -->
184- <p class="terminal-comment"> If you need more help:</p>
185- <p class="terminal-command"> <a href="http://webchat.freenode.net/">Ask on IRC, specify the channel #Ubuntu</a></p>
186- <p class="terminal-command"> <a href="http://webchat.freenode.net/">Ask on AskUbuntu</a></p>
187- <p class="terminal-command"> <a href="https://help.ubuntu.com/community/Beginners/FAQ/">Or Visit the Ubuntu Wiki</a></p>
188-
189- </div>
190- </div>
191- <div class="buttons">
192- <button class="button button-back" type="button">&#9664; Previous</button>
193- <button class="button button-next" type="button">Next &#9654;</button>
194- </div>
195- </div>
196-</body>
197-
198-</html>
199\ No newline at end of file
200
201=== added directory 'pages'
202=== added file 'pages/installing.html'
203--- pages/installing.html 1970-01-01 00:00:00 +0000
204+++ pages/installing.html 2016-01-30 11:55:05 +0000
205@@ -0,0 +1,62 @@
206+<html>
207+
208+<head>
209+ <title> Win2buntu </title>
210+ <meta charset="ISO-8859-1">
211+
212+ <meta name="viewport" content="width=500px, initial-scale=1.0">
213+
214+
215+ <link rel="shortcut icon" href="../imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
216+
217+ <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
218+ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
219+
220+ <script>
221+ isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
222+
223+ if(!isLinux){
224+ window.location.replace("notLinux.html");
225+ }
226+ </script>
227+
228+ <!--- Load ubuntu UI -->
229+ <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
230+
231+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
232+ <!-- [...] -->
233+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
234+ <!--- End load ubuntu UI -->
235+
236+ <!--- Load custom css to override Ubuntu UI -->
237+ <link rel="stylesheet" type="text/css" href="../css/default.css">
238+ <link rel="stylesheet" type="text/css" href="../css/terminal.css">
239+ <link rel="stylesheet" type="text/css" href="../css/buttons.css">
240+</head>
241+
242+<body>
243+ <h4> Installing applications<hr></h4>
244+ <div class="terminal">
245+ <div class="terminal-header">
246+ Terminal
247+ </div>
248+ <div class="terminal-body">
249+ <!-- Add apt section -->
250+ <p class="terminal-comment"> The command shown below allows you to add the Numix PPA, this will allow you to install packages developed and published by Numix.</p>
251+ <p class="terminal-command"> $ sudo add-apt-repository ppa:numix/ppa</p>
252+
253+ <!-- Authentication section -->
254+ <p class="terminal-comment"> As soon as you execute this command by pressing ENTER, you will be prompted by sudo to enter your password as shown below. Sudo is the Linux equivalent of running as Admin and is required to executing many commands that make changes to the system. Be aware that as you type your password it will not show up in the terminal. </p>
255+ <p class="terminal-output"> [sudo] password for $yourname: </p>
256+
257+ <p class="terminal-comment"> Once you've entered your password you will be prompted to confirm or deny the addition of this PPA. PPA is short for Personal Package Archive, this package archives are used to install new software packages. By default Ubuntu has a number of PPA configured which allow you to install a vast amount of software; however some packages are not and thus have to be added manually.</p>
258+
259+ <!-- Update and install section -->
260+ <p class="terminal-command"> $ sudo apt-get update</p>
261+ <p class="terminal-command"> $ sudo apt-get install numix-gtk-theme numix-icon-theme-circle </p>
262+ <p class="terminal-comment"> /* do this thing */</p>
263+ </div>
264+ </div>
265+
266+ </body>
267+</html>
268\ No newline at end of file
269
270=== added file 'pages/notLinux.html'
271--- pages/notLinux.html 1970-01-01 00:00:00 +0000
272+++ pages/notLinux.html 2016-01-30 11:55:05 +0000
273@@ -0,0 +1,57 @@
274+<html>
275+
276+<head>
277+ <title> Win2buntu </title>
278+ <meta charset="ISO-8859-1">
279+
280+ <meta name="viewport" content="width=500px, initial-scale=1.0">
281+
282+
283+ <link rel="shortcut icon" href="../imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
284+
285+ <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
286+ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
287+
288+ <script>
289+ isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
290+
291+ if(!isLinux){
292+ window.location.replace("notLinux.html");
293+ }
294+ </script>
295+
296+ <!--- Load ubuntu UI -->
297+ <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
298+
299+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
300+ <!-- [...] -->
301+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
302+ <!--- End load ubuntu UI -->
303+
304+ <!--- Load custom css to override Ubuntu UI -->
305+ <link rel="stylesheet" type="text/css" href="../css/default.css">
306+ <link rel="stylesheet" type="text/css" href="../css/terminal.css">
307+ <link rel="stylesheet" type="text/css" href="../css/buttons.css">
308+</head>
309+
310+<body>
311+ <h4 class="title"> Not Linux...<hr></h4>
312+ <div class="terminal full-height">
313+ <div class="terminal-header">
314+ Terminal
315+ </div>
316+ <div class="terminal-body">
317+ <!-- Add apt section -->
318+ <p class="terminal-comment"> It appears as if you have not installed Ubuntu yet, please install it before you continue with this guide</p>
319+ <p class="terminal-command"> <a href="http://askubuntu.com/questions/6328/how-do-i-install-ubuntu">Click here to find out how</a></p>
320+
321+ <!-- Authentication section -->
322+ <p class="terminal-comment"> If you need more help:</p>
323+ <p class="terminal-command"> <a href="http://webchat.freenode.net/">Ask on IRC, specify the channel #Ubuntu</a></p>
324+ <p class="terminal-command"> <a href="http://webchat.freenode.net/">Ask on AskUbuntu</a></p>
325+ <p class="terminal-command"> <a href="https://help.ubuntu.com/community/Beginners/FAQ/">Or Visit the Ubuntu Wiki</a></p>
326+
327+ </div>
328+ </div>
329+ </body>
330+</html>
331\ No newline at end of file
332
333=== added file 'win2buntu.html'
334--- win2buntu.html 1970-01-01 00:00:00 +0000
335+++ win2buntu.html 2016-01-30 11:55:05 +0000
336@@ -0,0 +1,85 @@
337+<html>
338+
339+<head>
340+ <title> Win2buntu </title>
341+ <meta charset="ISO-8859-1">
342+
343+ <meta name="viewport" content="width=500px, initial-scale=1.0">
344+
345+
346+ <link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
347+
348+ <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
349+ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
350+
351+ <script>
352+ isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
353+
354+ if(!isLinux){
355+ window.location.replace("notLinux.html");
356+ }
357+ </script>
358+
359+ <!--- Load ubuntu UI -->
360+ <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
361+
362+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
363+ <!-- [...] -->
364+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
365+ <!--- End load ubuntu UI -->
366+
367+ <!--- Load custom css to override Ubuntu UI -->
368+ <link rel="stylesheet" type="text/css" href="css/default.css">
369+ <link rel="stylesheet" type="text/css" href="css/terminal.css">
370+ <link rel="stylesheet" type="text/css" href="css/buttons.css">
371+</head>
372+
373+<body>
374+
375+<script type="text/javascript">
376+ window.open('notLinux.html','width=175,height=450')
377+</script>
378+
379+ <div class="content">
380+ <iframe id="content-frame" scrolling="no" src=""></iframe>
381+
382+ <script>
383+ var urls = ["pages/installing.html", "pages/notLinux.html"];
384+ var urlIndex = 0;
385+ urlChange(urls[urlIndex]);
386+
387+ function urlChange(url) {
388+ console.log("Chaning to URL Index " + urlIndex)
389+ document.getElementById('content-frame').src = url;
390+ }
391+
392+
393+ function nextPage(){
394+ document.title = ("win2buntu (" + (urlIndex+1) + "/" + urls.length + ")")
395+
396+ if(urlIndex + 1 > urls.length-1){
397+ console.log("too high")
398+ urlIndex = -1;
399+ }
400+
401+ urlChange(urls[++urlIndex]);
402+ }
403+
404+ function prevPage(){
405+ if(urlIndex - 1 < 0){
406+ console.log("too low")
407+ urlIndex = urls.length;
408+ }
409+ urlChange(urls[--urlIndex]);
410+ }
411+ </script>
412+
413+ <div class="buttons">
414+ <button class="button button-back" onClick="prevPage()" type="button">&#9664; Previous</button>
415+ <button class="button button-next" onClick="nextPage()" type="button">Next &#9654;</button>
416+ </div>
417+
418+ </div>
419+</body>
420+
421+</html>
422\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: