[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: www/sites/edu/marble
From: Dennis Nienhüser <earthwings () gentoo ! org>
Date: 2012-11-12 23:01:17
Message-ID: 20121112230117.18E86AC857 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1325028 by nienhueser:
Reduce content on front page.
Add move note to marble.kde.org. Remove links from the menu which are
direct redirects to marble.kde.org.
M +3 -59 index.php
M +2 -8 menu.json
--- trunk/www/sites/edu/marble/index.php #1325027:1325028
@@ -11,7 +11,7 @@
$appinfo = new AppInfo( "Marble" );
$appinfo->setIcon( "./logo/marble-logo-72dpi.png", "328", "92" );
- $appinfo->setVersion( "1.4.0" );
+ $appinfo->setVersion( "1.4.3" );
$appinfo->setCopyright( "2005", "The Marble Project" );
$appinfo->setLicense("lgpl");
$appinfo->show();
@@ -20,69 +20,13 @@
?>
-<p><img border="0" width="512" height="296" \
src="./screenshots/0.6/marbleflow_0_6.png"></p>
-<div id="quicklinks">
-[
- <a href="#users"><?php i18n( "For Users" ); ?></a> |
- <a href="#developers"><?php i18n( "For Developers" ); ?></a> |
- <a href="#news"><?php i18n( "Latest news" ); ?></a> |
-]
-</div>
-<p>
-<table border="0" bgcolor="#F0F0F0" cellpadding="7">
- <tr>
- <td valign="middle"><a href="http://www.youtube.com/watch?v=iukEWGoDNho" \
border="0"><img border="0" src="./gcds2009_thumb.jpg"></a></td>
- <td style="vertical-align: top;"><p><?php i18n( "For a short introduction into \
Marble you might want to have a look at the
-<b><a href=\"http://developer.kde.org/~tackat/marble-akademy2009.pdf\">slides</a></b> \
of our <b>presentation about Marble</b> at <a \
href=\"http://www.grancanariadesktopsummit.org/\">Akademy / GCDS \
2009</a>." ); ?>
-<p><?php i18n( "There's also a <b><a \
href=\"http://www.youtube.com/watch?v=iukEWGoDNho\" \
border=\"0\">YouTube-video</a></b> of the
-first 10 minutes available. The full video can be downloaded <a \
href=\"http://www.geeksoc.org/gcds/Torsten Rahn, \
Marble.ogv\">here</a>" ); ?>
- </td>
- </tr>
-</table>
-<br>
+<p>The Marble website has moved to <a \
href="http://marble.kde.org">marble.kde.org</a></p> +<p>We are redirecting content as \
needed. Please update your bookmarks and enjoy our new website at <a \
href="http://marble.kde.org">marble.kde.org</a>!</p>
-</p>
-<h3><a name="description"><?php i18n( "For Users: Marble Virtual Globe" ); \
?></a></h3> <p>
-<dl> <dt> <a href="./screenshots/0.6/marble_users.jpg"><img border="0" width="410" \
height="307" src="./screenshots/0.6/marble_users_thumb.jpg" alt="Streetmap of \
Linköping in Sweden"></a> </dt> <dd><i><?php i18n( "Streetmap of Linköping in \
Sweden" ); ?></i></dd> </dl>
-</p>
-
- <p><?php i18n( "Marble is a Virtual Globe and World Atlas that you can use to \
learn more about Earth: You can pan and zoom around and you can look up places and \
roads. A mouse click on a place label will provide the respective <a \
href=\"http://www.wikipedia.org\">Wikipedia</a> article." ); ?></p>
- <p><?php i18n( "Of course it's also possible to measure distances between \
locations or watch the current cloud cover. Marble offers different thematic maps: A \
classroom-style <i>topographic map</i>, a <i>satellite view</i>, <i>street map</i>, \
<i>earth at night</i> and <i>temperature and precipitation maps</i>. All maps include \
a custom map key, so it can also be used as an educational tool for use in \
class-rooms. For educational purposes you can also change date and time and watch how \
the starry sky and the twilight zone on the map change." ); ?></p>
- <p><?php i18n( "In opposite to other virtual globes Marble also features multiple \
projections: Choose between a Flat Map (\"Plate carré\"), Mercator or the Globe." ); \
?></p>
- <p><?php i18n( "The best of all: Marble is Free Software / Open Source Software \
and promotes the usage of <a href=\"http://www.openstreetmap.org\">free maps</a>. And \
it's available for all major operating systems (Linux/Unix, MS Windows and Mac OS \
X)." ); ?></p>
-
-<h3><a name="developers"><?php i18n( "For Developers: Marble Widget" ); ?></a></h3>
-<p>
-<dl> <dt> <a href="./screenshots/0.6/marble_designer.jpg"><img border="0" \
width="410" height="307" src="./screenshots/0.6/marble_designer_thumb.jpg" alt="Using \
Marble Widget in Qt4 Designer"></a> </dt> <dd><i><?php i18n( "Using Marble Widget in \
Qt4 Designer" ); ?></i></dd> </dl>
-</p>
-
- <p><?php i18n( "Marble is a light weight generic geographical map component for \
use in your own Qt 4.x / C++ application. The MarbleWidget provides a ready-made \
solution for displaying maps and locations. This includes support for GPS tracking \
and importing KML/GPX files." ); ?>
- </p>
-<ul>
-<li><?php i18n( "Marble is cross platform and runs on Windows, Linux and Mac OS X." \
); ?> </li>
-<li><?php i18n( "Marble runs decently even without hardware acceleration. It just \
uses Qt's Arthur API as a painting backend. Optional OpenGL support is being worked \
on." ); ?></li>
-<li><?php i18n( "Marble uses vector as well as bitmap data. Marble pulls much of its \
data from internet servers but can also be used offline." ); ?></li>
-<li><?php i18n( "Marble provides a plugin architecture and can easily be extended \
for lots of use cases." ); ?>
-<li><?php i18n( "Marble has got support for several 3rd party data sources like \
OpenStreetMap, Wikipedia, KML, GPX etc." ); ?>
-<li><?php i18n( "Marble can use several projections: Globe, Flat (\"Plate Carree\") \
and Mercator." ); ?></li>
-<li><?php i18n( "Marble starts up very quickly" ); ?></li>
-</ul>
- <p><?php i18n( "There are a few <a \
href=\"http://techbase.kde.org/Projects/Marble/MarbleUsedBy\">Success Stories</a> \
about applications which are using Marble. For more information you can also have a \
look at the <a href=\"http://techbase.kde.org/Projects/Marble/MarbleCPlusPlus\">Marble \
Widget Tutorial</a>." ); ?>
-
-
-<?php
- kde_general_news("./news.rdf", 10, true);
- ?>
-
-
-<hr width="30%" align="center" />
-<p>
<?php i18n( "Last update:" ); ?> <?php echo date ("Y-m-d", filemtime(__FILE__)); ?>
</p>
-<a href="https://plus.google.com/109002795119670287274" rel="publisher" />
-
<?php
include "footer.inc";
?>
--- trunk/www/sites/edu/marble/menu.json #1325027:1325028
@@ -1,15 +1,9 @@
{
- "Info": "index.php",
- "Download": "download.php",
- "Support" : "support.php",
- "Visual Changelog": "current.php",
+ "Home": "http://marble.kde.org",
"Screenshots": "screenshots.php",
"User Manual": "http://docs.kde.org/development/en/kdeedu/marble/",
"Reviews & Awards": "press.php",
- "Compiling Marble": "obtain.php",
"Marble TechBase": "http://techbase.kde.org/Projects/Marble",
"Credits: Authors": "authors.php",
- "Credits: Data": "data.php",
- "Download additional maps" : "maps-4.5.php",
- "Download additional speakers" : "speakers.php"
+ "Credits: Data": "data.php"
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic