fluffy – Diff between revs 7 and 9

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 7 Rev 9
Line 14... Line 14...
14 <!-- FileInput --> 14 <!-- FileInput -->
15 <link href="/node_modules/bootstrap-fileinput/css/fileinput.min.css" media="all" rel="stylesheet" type="text/css" /> 15 <link href="/node_modules/bootstrap-fileinput/css/fileinput.min.css" media="all" rel="stylesheet" type="text/css" />
16 <!-- Bootstrap Select --> 16 <!-- Bootstrap Select -->
17 <link href="/node_modules/bootstrap-select/dist/css/bootstrap-select.min.css" media="all" rel="stylesheet" type="text/css" /> 17 <link href="/node_modules/bootstrap-select/dist/css/bootstrap-select.min.css" media="all" rel="stylesheet" type="text/css" />
Line -... Line 18...
-   18
-   19 <!-- Wizardry and Steamworks Window Manager Style -->
-   20 <link href='/node_modules/was.wm.js/css/wm.css' rel='stylesheet' type='text/css'>
18 21
19 <!-- Fluffy style --> 22 <!-- Fluffy style -->
Line 20... Line 23...
20 <link href='/css/style.css' rel='stylesheet' type='text/css'> 23 <link href='/css/style.css' rel='stylesheet' type='text/css'>
21   24  
22 </head> 25 </head>
-   26 <body>
-   27 <div class="container">
-   28 <div id="window-manager-desktop">
23 <body> 29 </div>
24 <div id='cloud'></div> 30 </div>
25 <!-- Add and remove buttons --> 31 <!-- Add and remove buttons -->
26 <div class="add" data-toggle="modal" data-target="#addModal">+</div> 32 <div class="add" data-toggle="modal" data-target="#addModal">+</div>
27 <div class="remove" data-toggle="modal" data-target="#removeModal">-</div> 33 <div class="remove" data-toggle="modal" data-target="#removeModal">-</div>
Line 113... Line 119...
113 <script src='/node_modules/bootstrap-validator/dist/validator.min.js'></script> 119 <script src='/node_modules/bootstrap-validator/dist/validator.min.js'></script>
114 <!-- FileInput --> 120 <!-- FileInput -->
115 <script src='/node_modules/bootstrap-fileinput/js/fileinput.min.js'></script> 121 <script src='/node_modules/bootstrap-fileinput/js/fileinput.min.js'></script>
116 <!-- Bootstrap Select --> 122 <!-- Bootstrap Select -->
117 <script src='/node_modules/bootstrap-select/js/bootstrap-select.js'></script> 123 <script src='/node_modules/bootstrap-select/js/bootstrap-select.js'></script>
-   124 <!-- Wizardry and Steamworks Window Manager -->
-   125 <script src="/node_modules/was.wm.js/dist/was.wm.min.js"></script>
-   126
118 <script> 127 <script>
119 $(document).ready(function() { 128 $(document).ready(function() {
120 $.getJSON('/data/data.json', (services) => { -  
121 // Create and display the tag cloud. -  
122 $('#cloud').svg3DTagCloud({ -  
-   129
123 entries: services, 130 var wm = new wasWM('/services');
124 width: '100%', -  
125 height: '100%', -  
126 radius: '65%', -  
127 radiusMin: 75, -  
128 bgDraw: true, -  
129 bgColor: '#000', -  
130 opacityOver: 1.00, -  
131 opacityOut: 0.05, -  
132 opacitySpeed: 6, -  
133 fov: 800, -  
134 speed: 2, -  
135 //fontFamily: 'Oswald, Arial, sans-serif', -  
136 fontSize: '14px', -  
137 fontColor: '#000', -  
138 fontWeight: 'bold', //bold -  
139 fontStyle: 'normal', //italic -  
140 fontStretch: 'normal', //wider, narrower, ultra-condensed, extra-condensed, condensed, semi-condensed, semi-expanded, expanded, extra-expanded, ultra-expanded -  
141 fontToUpperCase: true, -  
142 //tooltipFontFamily: 'Oswald, Arial, sans-serif', -  
143 tooltipFontSize: '14px', -  
144 tooltipFontColor: '#000', -  
145 tooltipFontWeight: 'bold', //bold -  
146 tooltipFontStyle: 'normal', //italic -  
147 tooltipFontStretch: 'normal', //wider, narrower, ultra-condensed, extra-condensed, condensed, semi-condensed, semi-expanded, expanded, extra-expanded, ultra-expanded -  
148 tooltipFontToUpperCase: false, -  
149 tooltipTextAnchor: 'middle', -  
150 tooltipDiffX: 0, -  
151 tooltipDiffY: 16 -  
152 }); -  
153 131
154 // Populate the dropbox for removing services. 132 // Populate the dropbox for removing services when the modal is shown.
-   133 $('#removeModal').on('show.bs.modal', () => {
155 services.forEach((service) => { 134 wm.icons.forEach((service) => {
156 if ($("#remove-services option[value='" + service.tooltip + "']").length === 0) { 135 if ($("#remove-services option[value='" + service + "']").length === 0) {
157 $("#remove-services").append('<option value="' + service.tooltip + '">' + service.tooltip + '</option>'); 136 $("#remove-services").append('<option value="' + service + '">' + service + '</option>');
158 } 137 }
159 }); 138 });
160 $('#remove-services').selectpicker('refresh'); 139 $('#remove-services').selectpicker('refresh');
-   140 });
161 141
162 // Initialize file input for adding service icons. 142 // Initialize file input for adding service icons.
163 $('#service-icon').fileinput({ 143 $('#service-icon').fileinput({
164 previewFileType: [ "image" ], 144 previewFileType: [ "image" ],
165 allowedFileTypes: [ "image" ], 145 allowedFileTypes: [ "image" ],
166 allowedFileExtensions: [ "png" ], 146 allowedFileExtensions: [ "png" ],
167 maxFilesNum: 1 147 maxFilesNum: 1
168 }); 148 });
169 149
170 // Validation process to ensure that all parameters are passed. 150 // Validation process to ensure that all parameters are passed.
171 $('#addService').validator().on('submit', function (e) { 151 $('#addService').validator().on('submit', function (e) {
172 if (e.isDefaultPrevented()) 152 if (e.isDefaultPrevented())
173 return; 153 return;
174 }); 154 });
175 155
176 $('#removeService').validator().on('submit', function (e) { 156 $('#removeService').validator().on('submit', function (e) {
177 if (e.isDefaultPrevented()) 157 if (e.isDefaultPrevented())
178 return; 158 return;
179 }); 159 });
180 }); -  
181 }); 160 });
182 </script> 161 </script>
183 </body> 162 </body>
184   163