Skip to content

Commit 8953513

Browse files
author
Matt Karl
committed
Menu updates
1 parent 0a53752 commit 8953513

30 files changed

+391
-166
lines changed

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpringRollStudio",
3-
"version": "0.2.0-alpha.5",
3+
"version": "0.2.0-alpha.6",
44
"private": true,
55
"dependencies": {
66
"jqueryui": "*",

‎deploy/captions.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<title>Caption Creator</title>
5+
<title>Captions</title>
66
<link href="assets/css/libraries.css" rel="stylesheet">
7+
<link href="assets/css/shared.css" rel="stylesheet">
78
<link href="assets/css/captions.css" rel="stylesheet">
89
<script src="assets/js/libraries.js"></script>
10+
<script src="assets/js/shared.js"></script>
911
<script src="assets/js/captions.js"></script>
1012
</head>
1113
<body class="empty">
1214
<div id="frame">
1315
<header>
14-
<h1>Caption Creator</h1>
16+
<h1>Captions</h1>
1517
<button class="btn btn-md" id="refreshButton">
1618
<span class="glyphicon glyphicon-refresh"></span>
1719
</button>
18-
<!-- <button class="btn btn-md" id="quitButton">
19-
<span class="glyphicon glyphicon-remove"></span>
20-
</button> -->
2120
</header>
2221
<div class="row" id="instructions">
2322
<div class="text">

‎deploy/index.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
<img src="assets/images/icon.png?v=0.2.0-alpha" class="logo">
1414
</header>
1515
<nav class="modules btn-group">
16-
<a class="btn btn-primary" href="new.html" id="new" target="_blank" title="New Project" data-width="550" data-height="670" data-resizable="false">
16+
<a class="btn btn-sm btn-primary" href="new.html" id="new" target="_blank" title="New Project" data-width="550" data-height="670" data-resizable="false">
1717
<span class="icon glyphicon glyphicon-file"></span> New
1818
</a>
19-
<button class="btn btn-primary" id="openButton" title="Open Project">
19+
<button class="btn btn-sm btn-primary" id="openButton" title="Open Project">
2020
<span class="icon glyphicon glyphicon-folder-open"></span> Open
2121
</button>
22-
<button class="btn btn-primary" id="closeButton" title="Close Project">
22+
<button class="btn btn-sm btn-primary" id="closeButton" title="Close Project">
2323
<span class="icon glyphicon glyphicon-remove"></span> Close
2424
</button>
2525
</nav>
@@ -29,18 +29,18 @@
2929
</div>
3030
<div class="modules btn-group-vertical">
3131
<a class="btn btn-primary btn-lg requires-project" href="captions.html" id="captions" target="_blank" title="Caption Creator" data-width="640" data-height="480" data-min-width="510" data-min-height="400">
32-
Caption Creator
32+
<span class="icon glyphicon glyphicon-subtitles"></span> Captions
3333
</a>
3434
<a class="btn btn-primary btn-lg requires-project" href="tasks.html" id="tasks" target="_blank" title="Task Runner" data-width="480" data-height="400" data-min-height="275" data-min-width="280">
35-
Task Runner
35+
<span class="icon glyphicon glyphicon-fire"></span> Tasks
3636
</a>
3737
<a class="btn btn-primary btn-lg requires-project" href="preview.html" id="preview" target="_blank" title="Preview" data-width="800" data-height="550" data-min-height="200" data-min-width="400">
38-
Preview
38+
<span class="icon glyphicon glyphicon-search"></span> Preview
3939
</a>
4040
<a class="btn btn-primary btn-lg" href="remote.html" id="remote" target="_blank" title="Remote Trace" data-width="480" data-height="400" data-min-height="275" data-min-width="400">
41-
Remote Trace
41+
<span class="icon glyphicon glyphicon-send"></span> Remote Trace
4242
</a>
4343
</div>
44-
<footer class="version">Version <span id="version">0.2.0-alpha.5</span></footer>
44+
<footer class="version">Version <span id="version">0.2.0-alpha.6</span></footer>
4545
</body>
4646
</html>

‎deploy/new.html

+2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<meta charset="utf-8">
55
<title>New Project</title>
66
<link href="assets/css/libraries.css" rel="stylesheet">
7+
<link href="assets/css/shared.css" rel="stylesheet">
78
<link href="assets/css/new.css" rel="stylesheet">
89
<script src="assets/js/libraries.js"></script>
10+
<script src="assets/js/shared.js"></script>
911
<script src="assets/js/new.js"></script>
1012
</head>
1113
<body>

‎deploy/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "SpringRollStudio",
33
"description": "Application for SpringRoll projects",
4-
"version": "0.2.0-alpha.5",
4+
"version": "0.2.0-alpha.6",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/SpringRoll/SpringRollStudio"
@@ -14,8 +14,8 @@
1414
"toolbar": false,
1515
"frame": true,
1616
"position": "center",
17-
"width": 340,
18-
"height": 435,
17+
"width": 300,
18+
"height": 430,
1919
"resizable": false
2020
},
2121
"webkit": {

‎deploy/preview.html

+2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<meta charset="utf-8">
55
<title>Preview</title>
66
<link href="assets/css/libraries.css" rel="stylesheet">
7+
<link href="assets/css/shared.css" rel="stylesheet">
78
<link href="assets/css/preview.css" rel="stylesheet">
89
<script src="assets/js/libraries.js"></script>
10+
<script src="assets/js/shared.js"></script>
911
<script src="assets/js/preview.js"></script>
1012
</head>
1113
<body>

‎deploy/remote.html

+2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<meta charset="utf-8">
55
<title>Remote Trace</title>
66
<link href="assets/css/libraries.css" rel="stylesheet">
7+
<link href="assets/css/shared.css" rel="stylesheet">
78
<link href="assets/css/remote.css" rel="stylesheet">
89
<script src="assets/js/libraries.js"></script>
10+
<script src="assets/js/shared.js"></script>
911
<script src="assets/js/remote.js"></script>
1012
</head>
1113
<body>

‎deploy/tasks-terminal.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<title>Task Runner</title>
5+
<title>Terminal Output</title>
66
<link href="assets/css/libraries.css" rel="stylesheet">
7+
<link href="assets/css/shared.css" rel="stylesheet">
78
<link href="assets/css/tasks.css" rel="stylesheet">
89
</head>
910
<body class="tasks-terminal">
11+
<header class="fixed">
12+
<h1 id="title"></h1>
13+
</header>
1014
<pre id="terminal"></pre>
1115
</body>
1216
</html>

‎deploy/tasks.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<title>Task Runner</title>
5+
<title>Tasks</title>
66
<link href="assets/css/libraries.css" rel="stylesheet">
7+
<link href="assets/css/shared.css" rel="stylesheet">
78
<link href="assets/css/tasks.css" rel="stylesheet">
89
<script src="assets/js/libraries.js"></script>
10+
<script src="assets/js/shared.js"></script>
911
<script src="assets/js/tasks.js"></script>
1012
</head>
1113
<body>
1214
<header class="fixed">
13-
<h1>Task Runner</h1>
15+
<h1>Tasks</h1>
1416
</header>
1517
<div id="tasks"></div>
1618
<div class="status">

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "SpringRollStudio",
33
"private": true,
4-
"version": "0.2.0-alpha.5",
4+
"version": "0.2.0-alpha.6",
55
"dependencies": {
66
"grunt": "~0.4.5",
77
"grunt-contrib-copy": "^0.7.0",

‎project.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "SpringRollStudio",
3-
"version": "0.2.0-alpha.5",
3+
"version": "0.2.0-alpha.6",
44
"main": [
55
"components/node-webkit-app/src/utils/UpdateChecker.js",
66
"components/node-webkit-app/src/utils/Browser.js",
77
"components/node-webkit-app/src/NodeWebkitApp.js",
88
"src/springroll/ModuleButton.js",
9+
"src/springroll/SpringRollStudioMenu.js",
910
"src/springroll/SpringRollStudio.js",
1011
"src/springroll/SpringRollStudio.less"
1112
],
@@ -48,9 +49,12 @@
4849
"components/wavesurfer.js/src/drawer.*.js"
4950
],
5051
"modules": {
51-
"captions": [
52+
"shared": [
5253
"components/node-webkit-app/src/utils/Browser.js",
5354
"src/springroll/Module.js",
55+
"src/springroll/Module.less"
56+
],
57+
"captions": [
5458
"src/springroll/captions/ui/ContextMenu.js",
5559
"src/springroll/captions/formats/*.js",
5660
"src/springroll/captions/ui/ProjectModal.js",
@@ -63,13 +67,10 @@
6367
"src/springroll/captions/Captions.less"
6468
],
6569
"remote": [
66-
"components/node-webkit-app/src/utils/Browser.js",
67-
"src/springroll/Module.js",
6870
"src/springroll/remote/RemoteTrace.js",
6971
"src/springroll/remote/RemoteTrace.less"
7072
],
7173
"tasks": [
72-
"src/springroll/Module.js",
7374
"src/springroll/tasks/utils/Utils.js",
7475
"src/springroll/tasks/utils/Settings.js",
7576
"src/springroll/tasks/input/TerminalWindow.js",
@@ -80,8 +81,6 @@
8081
"src/springroll/tasks/TaskRunner.less"
8182
],
8283
"new": [
83-
"components/node-webkit-app/src/utils/Browser.js",
84-
"src/springroll/Module.js",
8584
"src/springroll/new/JSONUtils.js",
8685
"src/springroll/new/TemplateModule.js",
8786
"src/springroll/new/Template.js",
@@ -91,7 +90,6 @@
9190
"src/springroll/new/NewProject.less"
9291
],
9392
"preview": [
94-
"src/springroll/Module.js",
9593
"src/springroll/preview/Preview.js",
9694
"src/springroll/preview/Preview.less"
9795
]

‎src/springroll/Module.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
var gui = require('nw.gui');
66
}
77

8+
var Browser = include('cloudkid.Browser');
9+
810
/**
911
* The module is a sub-section of the app
1012
* @class Module
@@ -34,7 +36,10 @@
3436
{
3537
this.main.showDevTools();
3638
}
37-
}
39+
}
40+
41+
// Initialize the browser utility
42+
Browser.init();
3843
};
3944

4045
/**

‎src/springroll/Module.less

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@import 'less/mixins';
2+
@import 'less/header';
3+
@import 'less/fonts';
4+
@import 'less/scrollbar';

0 commit comments

Comments
 (0)