scratch – Diff between revs 28 and 29

Subversion Repositories:
Rev:
Only display areas with differencesIgnore whitespace
Rev 28 Rev 29
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html lang="en"> 2 <html lang="en">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1"> 6 <meta name="viewport" content="width=device-width, initial-scale=1">
7 <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> 7 <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
8 <meta name="description" content="quick asset upload"> 8 <meta name="description" content="quick asset upload">
9 <meta name="author" content="Wizardry and Steamworks"> 9 <meta name="author" content="Wizardry and Steamworks">
10 <link rel="icon" href="favicon.ico"> 10 <link rel="icon" href="favicon.ico">
11   11  
12 <title>Quickload</title> 12 <title>Quickload</title>
13   13  
14 <!-- Bootstrap core CSS --> 14 <!-- Bootstrap core CSS -->
15 <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet"> 15 <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet">
16   16  
17 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> 17 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
18 <link href="css/bootstrap/ie10-viewport-bug-workaround.css" rel="stylesheet"> 18 <link href="css/bootstrap/ie10-viewport-bug-workaround.css" rel="stylesheet">
19   19  
20 <!-- Just for debugging purposes. Don't actually copy these 2 lines! --> 20 <!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
21 <!--[if lt IE 9]><script src="js/bootstrap/ie8-responsive-file-warning.js"></script><![endif]--> 21 <!--[if lt IE 9]><script src="js/bootstrap/ie8-responsive-file-warning.js"></script><![endif]-->
22 <script src="js/bootstrap/ie-emulation-modes-warning.js"></script> 22 <script src="js/bootstrap/ie-emulation-modes-warning.js"></script>
23   23  
24 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> 24 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
25 <!--[if lt IE 9]> 25 <!--[if lt IE 9]>
26 <script src="js/bootstrap/html5shiv.min.js"></script> 26 <script src="js/bootstrap/html5shiv.min.js"></script>
27 <script src="js/bootstrap/respond.min.js"></script> 27 <script src="js/bootstrap/respond.min.js"></script>
28 <![endif]--> 28 <![endif]-->
29 29
30 <!-- Trumbowyg --> 30 <!-- Trumbowyg -->
31 <link href="css/trumbowyg/trumbowyg.min.css" rel="stylesheet"> 31 <link href="css/trumbowyg/trumbowyg.min.css" rel="stylesheet">
32 <!-- Local style --> 32 <!-- Local style -->
33 <!-- <link href="css/style.css" rel="stylesheet"> --> 33 <!-- <link href="css/style.css" rel="stylesheet"> -->
34 </head> 34 </head>
35   35  
36 <body> 36 <body>
37   37  
38 <div class="container"> 38 <div class="container">
39   39  
40 <!-- Main component for a primary marketing message or call to action --> 40 <!-- Main component for a primary marketing message or call to action -->
41 <div class="jumbotron"> 41 <div class="jumbotron">
42 <h1>Quickload</h1> 42 <h1>Quickload</h1>
43 <p>Asset sharing platform.</p> 43 <p>Asset sharing platform.</p>
44 </div> 44 </div>
45 45
46 <ul class="nav nav-tabs"> 46 <ul class="nav nav-tabs">
47 <li><a href="index.html">Home</a></li> 47 <li><a href="index.html">Home</a></li>
48 <li><a href="files.html">Files</a></li> 48 <li><a href="files.html">Files</a></li>
49 <li class="active"><a href="#">Text</a></li> 49 <li class="active"><a href="#">Text</a></li>
50 </ul> 50 </ul>
51 51
52 <div id="trumbowyg" style="height:334px;"> 52 <div id="trumbowyg" style="height:334px;">
53 </div> 53 </div>
54   54  
55 </div> <!-- /container --> 55 </div> <!-- /container -->
56 56
57 <div id="footer"> 57 <div id="footer">
58 <div class="container"> 58 <div class="container">
59 <p class="text-muted credit">Copyright <i class="glyphicon glyphicon-copyright-mark"></i> 2017 <a href="http://grimore.org">Wizardry and Steamworks</a>.</p> 59 <p class="text-muted credit">Copyright <i class="glyphicon glyphicon-copyright-mark"></i> 2017 <a href="http://grimore.org">Wizardry and Steamworks</a>.</p>
60 </div> 60 </div>
61 </div> 61 </div>
62   62  
63 <script src="js/jquery/jquery.min.js"></script> 63 <script src="js/jquery/jquery.min.js"></script>
64 <script src="js/bootstrap/bootstrap.min.js"></script> 64 <script src="js/bootstrap/bootstrap.min.js"></script>
65 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> 65 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
66 <script src="js/bootstrap/ie10-viewport-bug-workaround.js"></script> 66 <script src="js/bootstrap/ie10-viewport-bug-workaround.js"></script>
67 67
68 <!-- Trumbowyg --> 68 <!-- Trumbowyg -->
69 <script src="js/trumbowyg/trumbowyg.min.js"></script> 69 <script src="js/trumbowyg/trumbowyg.min.js"></script>
70 <script> 70 <script>
71 $(document).ready(() => { 71 $(document).ready(() => {
72 $('#trumbowyg').trumbowyg({ 72 $('#trumbowyg').trumbowyg({
73 autogrow: true 73 autogrow: true,
-   74 disabled: true
74 }).on("tbwchange", () => { 75 }).on('tbwchange', () => {
75 $.post("store-text.php", 76 $('#editor').trumbowyg('disable');
76 { 77 $.post('share-text.php', {
77 text: $('#trumbowyg').trumbowyg('html'), 78 data: $('#trumbowyg').trumbowyg('html'),
78 action: 'save' 79 }).done((data) => {
79 }, 80 $('#trumbowyg').trumbowyg('enable');
80 function(data, status){ 81 }).fail(() => {
81 //alert("Data: " + data + "\nStatus: " + status); 82 $('#trumbowyg').trumbowyg('enable');
82 }); 83 });
83 }); 84 });
-   85 $.get('share-text.php').done((data) => {
-   86 $('#trumbowyg')
-   87 .trumbowyg('html', data);
-   88 $('#trumbowyg').trumbowyg('enable');
-   89 }).fail(() => {
-   90 $('#trumbowyg').trumbowyg('enable');
-   91 });
84 }); 92 });
85 </script> 93 </script>
86 </body> 94 </body>
87 </html> 95 </html>
88   96