Skip to content

GitLab

A
appinventor-sources
Commit 72c7ab00 authored by andrew.f.mckinney's avatar andrew.f.mckinney
Browse files
Options

Modified status panel with new TOS link. Also, added version number to buildserver vars.

parent ea34dcfd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 750 deletions
appinventor/appengine/src/com/google/appinventor/client/OdeMessages.java
View file @ 72c7ab00
......@@ -185,6 +185,10 @@ public interface OdeMessages extends Messages {
@DefaultMessage("Terms")
@Description("Label of the link for Terms")
String termsLink();
@DefaultMessage("Privacy Policy and Terms of Use")
@Description("Label of the link for Privacy and Terms of Use")
String privacyTermsLink();
// Used in TopPanel.java
......
appinventor/appengine/src/com/google/appinventor/client/StatusPanel.java
View file @ 72c7ab00
......@@ -17,13 +17,8 @@ import com.google.gwt.user.client.ui.Label;
*/
public class StatusPanel extends Composite {
private String AppInventorFooter =
"©2010 Google" +
" - <a href='" + Ode.APP_INVENTOR_DOCS_URL + "/about/'" +
" target=_blank>" + MESSAGES.aboutLink() + "</a>" +
" - <a href='" + Ode.APP_INVENTOR_DOCS_URL + "/about/privacy.html'" +
" target=_blank>" + MESSAGES.privacyLink() + "</a>" +
" - <a href='" + Ode.APP_INVENTOR_DOCS_URL + "/about/termsofservice.html'" +
" target=_blank>" + MESSAGES.termsLink() + "</a>";
"<a href='" + Ode.APP_INVENTOR_DOCS_URL + "/about/termsofservice.html/'" +
" target=_blank>" + MESSAGES.privacyTermsLink() + "</a>";
/**
* Initializes and assembles all UI elements shown in the status panel.
......
appinventor/buildserver/src/com/google/appinventor/buildserver/BuildServer.java
View file @ 72c7ab00
......@@ -156,6 +156,10 @@ public class BuildServer {
variables.put("vm-vender", runtimeBean.getVmVendor());
variables.put("vm-version", runtimeBean.getVmVersion());
//BuildServer Version and Id
variables.put("buildserver-version", MercurialBuildId.getVersion() + "");
variables.put("buildserver-id", MercurialBuildId.getId() + "");
// OS
OperatingSystemMXBean osBean = ManagementFactory.getOperatingSystemMXBean();
variables.put("os-arch", osBean.getArch());
......@@ -172,7 +176,7 @@ public class BuildServer {
variables.put("max-memory", runtime.maxMemory() + "");
variables.put("used-heap", memoryBean.getHeapMemoryUsage().getUsed() + "");
variables.put("used-non-heap", memoryBean.getNonHeapMemoryUsage().getUsed() + "");
// Build requests
variables.put("count-async-build-requests", asyncBuildRequests.get() + "");
variables.put("rejected-async-build-requests", rejectedAsyncBuildRequests.get() + "");
......@@ -182,13 +186,13 @@ public class BuildServer {
// Build tasks
int max = buildExecutor.getMaxActiveTasks();
if (max == 0) {
variables.put("maximum-simultaneous-build-tasks", "unlimited");
variables.put("maximum-simultaneous-build-tasks-allowed", "unlimited");
} else {
variables.put("maximum-simultaneous-build-tasks", max + "");
variables.put("maximum-simultaneous-build-tasks-allowed", max + "");
}
variables.put("completed-build-tasks", buildExecutor.getCompletedTaskCount() + "");
maximumActiveBuildTasks = Math.max(maximumActiveBuildTasks, buildExecutor.getActiveTaskCount());
variables.put("maximum-active-build-tasks", maximumActiveBuildTasks + "");
variables.put("maximum-simultaneous-build-tasks-occurred", maximumActiveBuildTasks + "");
variables.put("active-build-tasks", buildExecutor.getActiveTaskCount() + "");
StringBuilder html = new StringBuilder();
......
appinventor/docs/about/policy.html deleted 100644 → 0
View file @ ea34dcfd
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta content="App Inventor for Android" name="description">
<meta content="Android, Blocks App Inventor, Mobile, Phone, IDE" name="keywords">
<title>
Content Policy - App Inventor for Android
</title>
<link href="/static/images/appinventor-16.png" rel="SHORTCUT ICON" type="image/ico">
<link href="/static/images/appinventor-16.png" rel="icon" type="image/png">
<link href="/static/css/appinventor.css" rel="stylesheet">
<script src="http://www.google.com/js/gweb/analytics/autotrack.js">
</script>
<script>
var tracker = new gweb.analytics.AutoTrack({
profile: 'UA-5856106-2'
});
</script>
<style>
img.c2 {border-width:0}
div.c1 {clear:both;}
</style>
</head>
<body>
<div id="aiac">
<div class="main-container">
<div class="header">
<div class="header-title">
<a href="/about/"><img alt="" src="/static/images/appinventor_logo.gif"></a>
</div>
<form action="http://www.google.com/cse" id="cse-search-box">
<input name="cx" type="hidden" value="011848991959401852367:xnrcbhk2zus"> <input name=
"ie" type="hidden" value="UTF-8">
<div class="header-search">
<div class="header-search-query">
<input class="textbox" name="q" type="text">
</div>
<div class="header-search-button">
<input name="sa" src="/static/images/search-button.png" type="image">
</div>
</div>
</form><script src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"
>
</script>
<div class="header-login">
<div class="header-login-greeting">
Welcome to App Inventor!
</div>
</div>
</div>
<div class="customhr customhr-green"></div>
<div id="navigation">
<div id="navigation-links">
<div class="navigation-link-option navigation-link-active" id="navigation-link-home">
<a href="/about/">About</a>
</div>
<div class="navigation-link-option" id="navigation-link-learn">
<a href="/learn/">Learn</a>
</div>
<div class="navigation-link-option" id="navigation-link-forum">
<a href="/forum/">Forum</a>
</div>
<div class="navigation-link-option" id="navigation-link-myappinventor">
<a href="http://appinventor.googlelabs.com/ode/Ya.html" target="_blank">My
Projects</a>
</div>
</div>
<div id="navigation-breadcrumb">
<a href="index.html">About</a> &gt; Content Policy &gt;
</div>
<div class="c1"></div>
</div>
<div class="customhr customhr-gray"></div>
<div class="content">
<div class="content-body">
<div class="learn-page">
<h1>
App Inventor Content Policies
</h1>
</div>
</div>
</div>
<div class="footer">
<div class="footer-legal">
<p>
<a href="http://creativecommons.org/licenses/by/3.0/" rel="license"><img alt=
"Creative Commons License" class="c2" src=
"http://i.creativecommons.org/l/by/3.0/88x31.png"></a><br>
This work is licensed under a <a href="http://creativecommons.org/licenses/by/3.0/"
rel="license">Creative Commons Attribution 3.0 Unported License</a> .
</p>
<p>
©2011 Google<br>
<a href="/about/index.html">About</a> | <a href="/about/privacy.html">Privacy</a> |
<a href="/about/termsofservice.html">Terms</a>
</p>
</div>
<div class="footer-lastupdate">
<script>
if (document.lastModified != '') {
var m = "Page last updated: " + document.lastModified;
var p = m.length-8;
document.writeln("<center>");
document.write(m.substring(p, 0));
document.writeln("<\/center>");
}
</script>
</div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
appinventor/docs/about/privacy.html deleted 100644 → 0
View file @ ea34dcfd
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta content="App Inventor for Android" name="description">
<meta content="Android, Blocks App Inventor, Mobile, Phone, IDE" name="keywords">
<title>
Privacy - App Inventor for Android
</title>
<link href="/static/images/appinventor-16.png" rel="SHORTCUT ICON" type="image/ico">
<link href="/static/images/appinventor-16.png" rel="icon" type="image/png">
<link href="/static/css/appinventor.css" rel="stylesheet">
<script src="http://www.google.com/js/gweb/analytics/autotrack.js">
</script>
<script>
var tracker = new gweb.analytics.AutoTrack({
profile: 'UA-5856106-2'
});
</script>
<style>
img.c2 {border-width:0}
div.c1 {clear:both;}
</style>
</head>
<body>
<div id="aiac">
<div class="main-container">
<div class="header">
<div class="header-title">
<a href="/about/"><img alt="" src="/static/images/appinventor_logo.gif"></a>
</div>
<form action="http://www.google.com/cse" id="cse-search-box">
<input name="cx" type="hidden" value="011848991959401852367:xnrcbhk2zus"> <input name=
"ie" type="hidden" value="UTF-8">
<div class="header-search">
<div class="header-search-query">
<input class="textbox" name="q" type="text">
</div>
<div class="header-search-button">
<input name="sa" src="/static/images/search-button.png" type="image">
</div>
</div>
</form><script src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"
>
</script>
<div class="header-login">
<div class="header-login-greeting">
Welcome to App Inventor!
</div>
</div>
</div>
<div class="customhr customhr-green"></div>
<div id="navigation">
<div id="navigation-links">
<div class="navigation-link-option navigation-link-active" id="navigation-link-home">
<a href="/about/">About</a>
</div>
<div class="navigation-link-option" id="navigation-link-learn">
<a href="/learn/">Learn</a>
</div>
<div class="navigation-link-option" id="navigation-link-forum">
<a href="/forum/">Forum</a>
</div>
<div class="navigation-link-option" id="navigation-link-myappinventor">
<a href="http://appinventor.googlelabs.com/ode/Ya.html" target="_blank">My
Projects</a>
</div>
</div>
<div id="navigation-breadcrumb">
<a href="index.html">About</a> &gt; Privacy &gt;
</div>
<div class="c1"></div>
</div>
<div class="customhr customhr-gray"></div>
<div class="content">
<div class="content-body">
<div class="learn-page">
<h1>
Privacy Policy
</h1>
<p>
Google’s Privacy Policy describes how we treat personal information when you use
Google’s products and services:
</p><a href=
"http://www.google.com/privacy.html">http://www.google.com/privacy.html</a>
</div>
</div>
</div>
<div class="footer">
<div class="footer-legal">
<p>
<a href="http://creativecommons.org/licenses/by/3.0/" rel="license"><img alt=
"Creative Commons License" class="c2" src=
"http://i.creativecommons.org/l/by/3.0/88x31.png"></a><br>
This work is licensed under a <a href="http://creativecommons.org/licenses/by/3.0/"
rel="license">Creative Commons Attribution 3.0 Unported License</a> .
</p>
<p>
©2011 Google<br>
<a href="/about/index.html">About</a> | <a href="/about/privacy.html">Privacy</a> |
<a href="/about/termsofservice.html">Terms</a>
</p>
</div>
<div class="footer-lastupdate">
<script>
if (document.lastModified != '') {
var m = "Page last updated: " + document.lastModified;
var p = m.length-8;
document.writeln("<center>");
document.write(m.substring(p, 0));
document.writeln("<\/center>");
}
</script>
</div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
appinventor/docs/about/termsofservice.html
View file @ 72c7ab00
This diff is collapsed.
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