Skip to content

GitLab

A
appinventor-sources
Commit a00afc14 authored by Evan W. Patton's avatar Evan W. Patton Committed by Jeffrey I. Schiller
Browse files
Options

Move various static assets into a static/ directory 

Change-Id: Ifbc57aa50255ffc2935ecc2605644e0f71bd085e
parent 7842b48e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 170 additions and 172 deletions
appinventor/appengine/build.xml
View file @ a00afc14
......@@ -65,6 +65,7 @@
<property name="build.war.dir" location="${local.build.dir}/war" />
<property name="build.extra.dir" location="${local.build.dir}/extra" />
<property name="build.static.dir" location="${build.war.dir}/static" />
<!-- =====================================================================
Copy static files to <build>/war, from war and elsewhere
......@@ -74,34 +75,44 @@
depends="init,blocklyeditor_BlocklyCompile">
<mkdir dir="${build.war.dir}" />
<copy todir="${build.war.dir}/">
<fileset dir="war">
<exclude name="blocklyframe.html"/>
<fileset dir="war" />
<fileset dir="${docs.dir}"/>
</copy>
<copy todir="${build.static.dir}/css" flatten="true">
<fileset dir="${lib.dir}/blockly">
<include name="**/*.css"/>
</fileset>
<fileset dir="src/${appinventor.pkg}">
<!-- canvas is a special case (see MockCanvas.java) -->
<include name="images/canvas.png" />
<fileset dir="${appinventor.dir}/blocklyeditor">
<include name="media/*.css"/>
</fileset>
<fileset dir="${docs.dir}"/>
</copy>
<mkdir dir="${build.war.dir}/assets/" />
<copy todir="${build.war.dir}/assets/" flatten="true">
<mkdir dir="${build.static.dir}/media"/>
<copy todir="${build.static.dir}/media" flatten="true">
<fileset dir="${lib.dir}/blockly">
<include name="media/*"/>
<include name="**/*.css"/>
<exclude name="media/*.css"/>
<exclude name="demo/**"/>
</fileset>
<fileset dir="${appinventor.dir}/blocklyeditor">
<include name="media/*"/>
<exclude name="media/*.css"/>
</fileset>
</copy>
<copy file="${build.dir}/blocklyeditor/blockly-all.js" tofile="${build.war.dir}/WEB-INF/classes/com/google/appinventor/client/editor/youngandroid/blockly.js" />
<copy todir="${build.war.dir}/">
<copy todir="${build.static.dir}">
<fileset dir="src/${appinventor.pkg}">
<!-- canvas is a special case (see MockCanvas.java) -->
<include name="images/canvas.png" />
</fileset>
<fileset dir="${lib.dir}">
<include name="closure-library/**/*"/>
<include name="closure-library/closure/goog/base.js"/>
<include name="closure-library/closure/goog/css/dialog.css"/>
<include name="closure-library/closure/goog/css/hsvapalette.css"/>
<include name="closure-library/closure/goog/deps.js"/>
</fileset>
</copy>
<!-- Resources for Maps designer view -->
<copy todir="${build.war.dir}/">
<copy todir="${build.static.dir}/">
<fileset dir="${lib.dir}">
<include name="leaflet/**/*"/>
<include name="font-awesome/**/*"/>
......
appinventor/appengine/src/com/google/appinventor/client/TopPanel.java
View file @ a00afc14
......@@ -66,8 +66,7 @@ public class TopPanel extends Composite {
private static final String WIDGET_NAME_LANGUAGE = "Language";
private static final String SIGNOUT_URL = "/ode/_logout";
private static final String LOGO_IMAGE_URL = "/images/codi_long.png";
private static final String LANGUAGES_IMAGE_URL = "/images/languages.svg";
private static final String LOGO_IMAGE_URL = "/static/images/codi_long.png";
private static final String WINDOW_OPEN_FEATURES = "menubar=yes,location=yes,resizable=yes,scrollbars=yes,status=yes";
private static final String WINDOW_OPEN_LOCATION = "_ai2";
......
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockCanvas.java
View file @ a00afc14
......@@ -84,7 +84,7 @@ public final class MockCanvas extends MockContainer {
if (url == null) {
// text was not recognized as an asset.
((MockCanvasLayout) layout).setBackgroundImageUrl("");
url = "images/canvas.png";
url = "static/images/canvas.png";
// We set the background image of the canvasWidget so it displays the image. We do it inside
// the if because we need to override the background-size property only for this case
MockComponentsUtil.setWidgetBackgroundImage(this, canvasWidget, url);
......
appinventor/appengine/war/WEB-INF/appengine-web.xml
View file @ a00afc14
......@@ -6,28 +6,17 @@
<!-- Configure serving/caching of GWT files -->
<static-files>
<include path="/fonts/*" expiration="365d">
<http-header name="Content-Type" value="font/ttf" />
</include>
<include path="/assets/*" />
<include path="/companions/*" />
<include path="/about/*" expiration="1d" />
<include path="/static/**" expiration="1d" />
<include path="/static/**" />
<include path="/static/fonts/*" expiration="365d">
<http-header name="Content-Type" value="font/ttf" />
</include>
<include path="/websiteassets/**" expiration="10s" />
<include path="/images/*" expiration="365d" />
<include path="/js/*" />
<include path="/Ya_tos_form.html" expiration="1d" />
<include path="/favicon.ico" expiration="365d" />
<include path="/gwt.css" expiration="1d" />
<include path="/Ya.css" />
<include path="/templates/**" expiration="1d" />
<include path="/reference/**" expiration="1d" />
<include path="/closure-library/closure/goog/base.js" expiration="1d" />
<include path="/closure-library/closure/goog/css/dialog.css" expiration="1d" />
<include path="/closure-library/closure/goog/css/hsvapalette.css" />
<include path="/closure-library/closure/goog/deps.js" expiration="1d" />
<include path="/leaflet/**" />
<include path="/font-awesome/**" />
<include path="/robots.txt" expiration="30d" />
<!-- These are not cached on purpose -->
......
appinventor/appengine/war/Ya_tos_form.html
View file @ a00afc14
<html>
<head>
<title>Terms of Service</title>
<link type="text/css" rel="stylesheet" href="Ya.css">
<link type="text/css" rel="stylesheet" href="static/css/Ya.css">
<link href='http://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
<script src="js/tos.js"></script>
<script src="static/js/tos.js"></script>
</head>
<body>
......
appinventor/appengine/war/index.html
View file @ a00afc14
......@@ -8,16 +8,16 @@
<!--meta name="gwt:property" content="locale=en_US"-->
<!-- Title is set at runtime. -->
<title> </title>
<link type="text/css" rel="stylesheet" href="gwt.css">
<link type="text/css" rel="stylesheet" href="assets/blockly.css">
<link type="text/css" rel="stylesheet" href="assets/ai2blockly.css">
<link type="text/css" rel="stylesheet" href="closure-library/closure/goog/css/dialog.css">
<link type="text/css" rel="stylesheet" href="closure-library/closure/goog/css/hsvapalette.css">
<link type="text/css" rel="stylesheet" href="font-awesome/css/font-awesome.min.css">
<link type="text/css" rel="stylesheet" href="leaflet/leaflet.css">
<link type="text/css" rel="stylesheet" href="leaflet/leaflet.toolbar.css">
<link type="text/css" rel="stylesheet" href="leaflet/leaflet-vector-markers.css">
<link type="text/css" rel="stylesheet" href="Ya.css">
<link type="text/css" rel="stylesheet" href="static/css/gwt.css">
<link type="text/css" rel="stylesheet" href="static/css/blockly.css">
<link type="text/css" rel="stylesheet" href="static/css/ai2blockly.css">
<link type="text/css" rel="stylesheet" href="static/closure-library/closure/goog/css/dialog.css">
<link type="text/css" rel="stylesheet" href="static/closure-library/closure/goog/css/hsvapalette.css">
<link type="text/css" rel="stylesheet" href="static/font-awesome/css/font-awesome.min.css">
<link type="text/css" rel="stylesheet" href="static/leaflet/leaflet.css">
<link type="text/css" rel="stylesheet" href="static/leaflet/leaflet.toolbar.css">
<link type="text/css" rel="stylesheet" href="static/leaflet/leaflet-vector-markers.css">
<link type="text/css" rel="stylesheet" href="static/css/Ya.css">
<noscript>
<div class="floatingBox">
<h2> App Inventor needs JavaScript enabled to run.</h2>
......@@ -37,16 +37,16 @@
<li> Firefox 23+ </li>
</ul>
</div>
<script type="text/javascript" src="closure-library/closure/goog/base.js"></script>
<script language="javascript" src="ode/ode.nocache.js"></script>
<script src="leaflet/leaflet.js"></script>
<script src="leaflet/leaflet.toolbar.js"></script>
<script src="leaflet/leaflet-vector-markers.min.js"></script>
<script src="leaflet/leaflet-imgicon.js"></script>
<script src="leaflet/Path.Drag.js"></script>
<script src="leaflet/Leaflet.Editable.js"></script>
<script src="leaflet/leaflet.geometryutil.js"></script>
<script src="leaflet/leaflet.snap.js"></script>
<script type="text/javascript" src="static/closure-library/closure/goog/base.js"></script>
<script type="text/javascript" src="ode/ode.nocache.js"></script>
<script src="static/leaflet/leaflet.js"></script>
<script src="static/leaflet/leaflet.toolbar.js"></script>
<script src="static/leaflet/leaflet-vector-markers.min.js"></script>
<script src="static/leaflet/leaflet-imgicon.js"></script>
<script src="static/leaflet/Path.Drag.js"></script>
<script src="static/leaflet/Leaflet.Editable.js"></script>
<script src="static/leaflet/leaflet.geometryutil.js"></script>
<script src="static/leaflet/leaflet.snap.js"></script>
<script>
if (window.navigator.userAgent.indexOf("MSIE") != -1){
document.getElementById("unsupported").style.display = 'block';
......
appinventor/appengine/war/login.jsp
View file @ a00afc14
......@@ -83,14 +83,14 @@ out.println("<center><font color=red><b>" + error + "</b></font></center><br/>")
<center>
<% if (locale != null && locale.equals("zh_CN")) { %>
<a href="http://www.weibo.com/mitappinventor" target="_blank"><img class="img-scale"
src="/images/mzl.png" width="30" height="30" title="Sina WeiBo"></a>&nbsp;
src="/static/images/mzl.png" width="30" height="30" title="Sina WeiBo"></a>&nbsp;
<% } %>
<a href="http://www.appinventor.mit.edu" target="_blank"><img class="img-scale"
src="/images/login-app-inventor.jpg" width="50" height="30" title="MIT App Inventor"></a></center>
src="/static/images/login-app-inventor.jpg" width="50" height="30" title="MIT App Inventor"></a></center>
<p></p>
<p style="text-align: center; clear:both;"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"
target="_blank"><img alt="Creative Commons License" src="/images/cc3.png"></a> <br>
target="_blank"><img alt="Creative Commons License" src="/static/images/cc3.png"></a> <br>
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_blank"></a></p>
</footer>
</body></html>
......
appinventor/appengine/war/Ya.css → appinventor/appengine/war/static/css/Ya.css
View file @ a00afc14
......@@ -14,24 +14,24 @@ they get cut off in Windows.
@font-face {
font-family: Roboto;
src: url('/fonts/Roboto-Regular.ttf');
src: url('../fonts/Roboto-Regular.ttf');
}
@font-face {
font-weight: bold;
font-family: Roboto;
src: url('/fonts/Roboto-Bold.ttf');
src: url('../fonts/Roboto-Bold.ttf');
}
@font-face {
font-family: OpenDyslexic;
src: url('/fonts/OpenDyslexic-Regular.otf');
src: url('../fonts/OpenDyslexic-Regular.otf');
}
@font-face {
font-weight: bold;
font-family: OpenDyslexic;
src: url('/fonts/OpenDyslexic-Bold.otf');
src: url('../fonts/OpenDyslexic-Bold.otf');
}
body, html {
......@@ -42,7 +42,7 @@ body {
background-color: lightgrey;
font-family: Roboto, Helvetica, Arial, sans-serif;
/* TODO(opensource): Change to commented version below once we're ready */
background: url(images/squairy_light.png);
background: url(../images/squairy_light.png);
}
.dyslexic * {
......@@ -122,7 +122,7 @@ body {
font-size: 13px;
background-color: #f7f9f2;
/* TODO(opensource): Delete the background-image line below once we're ready */
background-image: url(images/watermark.png);
background-image: url(../images/watermark.png);
color: #555;
border-left: 1px solid #d2d2d2;
border-bottom: 1px solid #d2d2d2;
......@@ -229,7 +229,7 @@ body {
}
.ode-ProjectHeaderRow {
background: url(images/toolbarBG.png) repeat;
background: url(../images/toolbarBG.png) repeat;
border: 1px;
border-bottom: 1px solid #bbccff;
}
......@@ -279,7 +279,7 @@ body {
}
.ode-ComponentHeaderRow {
background: url(images/toolbarBG.png) repeat;
background: url(../images/toolbarBG.png) repeat;
border: 1px;
border-bottom: 1px solid #bbccff;
}
......@@ -539,7 +539,7 @@ body {
font-size: 12px;
color: #888;
padding: 4px 12px;
background: url(images/toolbarBG.png) repeat;
background: url(../images/toolbarBG.png) repeat;
border: 1px;
border-bottom: 1px solid #bbccff;
}
......@@ -1019,7 +1019,7 @@ select.ode-PropertyEditor[disabled] {
/* ==== start: skins for Android */
.ode-SimpleMockFormPhoneLandscape {
background: url(images/phoneLandscape.png);
background: url(../images/phoneLandscape.png);
background-repeat: no-repeat;
background-position: right top;
background-size: 100% 100%;
......@@ -1027,7 +1027,7 @@ select.ode-PropertyEditor[disabled] {
}
.ode-SimpleMockFormPhonePortrait {
background: url(images/phonePortrait.png);
background: url(../images/phonePortrait.png);
background-repeat: no-repeat;
background-position: right top;
background-size: 100% 100%;
......@@ -1035,21 +1035,21 @@ select.ode-PropertyEditor[disabled] {
}
.ode-SimpleMockFormPhoneLandscapeTablet {
background: url(images/phoneLandscapeTablet.png);
background: url(../images/phoneLandscapeTablet.png);
background-repeat: no-repeat;
background-position: right top;
background-size: 100% 100%;
padding: 15px 56px 12px 64px;;
}
.ode-SimpleMockFormPhonePortraitTablet {
background: url(images/phonePortraitTablet.png);
background: url(../images/phonePortraitTablet.png);
background-repeat: no-repeat;
background-position: right top;
background-size: 100% 100%;
padding: 64px 13px 55px 13px;
}
.ode-SimpleMockFormPhoneLandscapeMonitor {
background: url(images/phoneLandscapeMonitor.png);
background: url(../images/phoneLandscapeMonitor.png);
background-repeat: no-repeat;
background-position: right top;
background-size: 100% 100%;
......@@ -1057,7 +1057,7 @@ select.ode-PropertyEditor[disabled] {
}
.ode-SimpleMockFormPhonePortraitMonitor {
background: url(images/phonePortraitMonitor.png);
background: url(../images/phonePortraitMonitor.png);
background-repeat: no-repeat;
background-position: right top;
background-size: 100% 100%;
......@@ -1123,7 +1123,7 @@ select.ode-PropertyEditor[disabled] {
.ode-SimpleMockFormNavigationBarPortrait {
min-height: 44px;
min-width: 100%;
background-image: url(images/navigationbarPortrait.png);
background-image: url(../images/navigationbarPortrait.png);
background-repeat: no-repeat;
background-position: center top;
}
......@@ -1131,7 +1131,7 @@ select.ode-PropertyEditor[disabled] {
.ode-SimpleMockFormNavigationBarLandscape {
min-height: 100%;
min-width: 44px;
background-image: url(images/navigationbarLandscape.png);
background-image: url(../images/navigationbarLandscape.png);
background-repeat: no-repeat;
background-position: right center;
}
......@@ -1333,13 +1333,13 @@ path.ode-SimpleMockMapFeature-selected {
.ode-RpcStatusMessage .popupBottomLeft {
width: 4px;
height: 4px;
background: url(images/rpcMessageCorners.png) no-repeat 0px -4px;
background: url(../images/rpcMessageCorners.png) no-repeat 0px -4px;
}
.ode-RpcStatusMessage .popupBottomRight {
width: 4px;
height: 4px;
background: url(images/rpcMessageCorners.png) no-repeat -4px -4px;
background: url(../images/rpcMessageCorners.png) no-repeat -4px -4px;
}
.ode-ErrorMessage {
......
appinventor/blocklyeditor/src/backpack.js
View file @ a00afc14
......@@ -67,22 +67,21 @@ Blockly.Backpack = function(targetWorkspace, opt_options) {
* @type {string}
* @private
*/
Blockly.Backpack.prototype.BPACK_CLOSED_ = 'assets/backpack-closed.png';
Blockly.Backpack.prototype.BPACK_CLOSED_ = 'static/media/backpack-closed.png';
/**
* URL of the small backpack image.
* @type {string}
* @private
*/
//Blockly.Backpack.prototype.BPACK_EMPTY_ = 'media/backpack-small-highlighted.png';
Blockly.Backpack.prototype.BPACK_EMPTY_ = 'assets/backpack-empty.png';
Blockly.Backpack.prototype.BPACK_EMPTY_ = 'static/media/backpack-empty.png';
/**
* URL of the full backpack image
* @type {string}
* @private
*/
Blockly.Backpack.prototype.BPACK_FULL_ = 'assets/backpack-full.png';
Blockly.Backpack.prototype.BPACK_FULL_ = 'static/media/backpack-full.png';
/**
* Width of the image.
......@@ -226,7 +225,7 @@ Blockly.Backpack.prototype.init = function() {
this.flyout_.workspace_.isBackpack = true;
// load files for sound effect
Blockly.getMainWorkspace().loadAudio_(['assets/backpack.mp3', 'assets/backpack.ogg', 'assets/backpack.wav'], 'backpack');
Blockly.getMainWorkspace().loadAudio_(['static/media/backpack.mp3', 'static/media/backpack.ogg', 'static/media/backpack.wav'], 'backpack');
var p = this;
this.getContents(function(contents) {
......
appinventor/blocklyeditor/src/blocklyeditor.js
View file @ a00afc14
......@@ -260,7 +260,7 @@ Blockly.BlocklyEditor['create'] = function(container, formName, readOnly, rtl) {
'trashcan': true,
'comments': true,
'disable': true,
'media': './assets/',
'media': './static/media/',
'grid': {'spacing': '20', 'length': '5', 'snap': true, 'colour': '#ccc'},
'zoom': {'controls': true, 'wheel': true, 'scaleSpeed': 1.1, 'maxScale': 3, 'minScale': 0.1}
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment