[PATCH 04 of 11] Merged

Wald Commits scm-commit at wald.intevation.org
Tue Mar 25 12:03:26 CET 2014


# HG changeset patch
# User Ariane Broermann <ariane at intevation.de>
# Date 1395742083 -3600
# Node ID 5d4b8372729efc8be7f5a7ee46c023592a8f560e
# Parent  d72e08246c51666571f2aeb066fd5d751a204f3a
# Parent  0e464c5a657c09f2092bd605faf81f2f0e98656b
Merged.

diff -r d72e08246c51 -r 5d4b8372729e d4e.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/d4e.html	Tue Mar 25 11:08:03 2014 +0100
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Dive4Elements</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta charset="utf-8">
+        <meta name="description" content="">
+        <meta name="author" content="Ariane Brörmann">
+        <!-- Bootstrap -->
+        <link href="bootstrap-3.1.0/dist/css/bootstrap.min.css" rel="stylesheet">
+
+        <!-- Custom styles for this template -->
+        <link href="css/style.css" rel="stylesheet">
+
+        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+        <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+        <![endif]-->
+
+        <!-- Bootstrap core JavaScript
+        ================================================== -->
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+        <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
+        <!-- Include all compiled plugins (below), or include individual files as needed -->
+        <script src="bootstrap-3.1.0/dist/js/bootstrap.min.js"></script>
+        <script src="js/dive4elements.js"></script>
+    </head>
+    <body>
+        <div class="container">
+            <!--#include file="header.html" -->
+            <div class="row row-dive4elements row-dive4elements-right">
+                <!--#include file="d4e_body.html" -->
+                <!--#include file="feed.html" -->
+            </div><!-- /row -->
+            <!--#include file="footer.html" -->
+        </div> <!-- /container -->
+    </body>
+</html>
+
diff -r d72e08246c51 -r 5d4b8372729e d4e_body.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/d4e_body.html	Tue Mar 25 11:08:03 2014 +0100
@@ -0,0 +1,31 @@
+<div class="col-xs-12 col-sm-6 col-md-8">
+    <p class="pull-right visible-xs">
+        <button type="button" class="btn btn-primary btn-xs"
+            data-toggle="dive4elements">News Feed</button>
+    </p>
+    <div class="jumbotron">
+        <h3>Dive4Elements</h3>
+        <p class="lead">Dive4Elements ist das Freie Software Basis-Framework,
+            in dem Fachanwendungen eingebettet werden können.<br/>
+            Fachliche Abläufe werden hierzu in einzelne
+            Paramerterisierungsabläfe zerlegt, die dann mit dem Nutzer zusammen so
+            durchschritten werden, dass am Ende ihrer Abarbeitung die resultierenden
+            Analysen visualisiert und exportiert werden können.
+            Dabei können sich die Analysen gegenseitig beeinflussen und auch
+            im Zusammenhang dargestellt werden.
+        </p>
+    </div><!-- /jumbobutton-->
+
+    <div class="row marketing">
+        <div class="col-lg-6">
+            <h4>Parameterisierung</h4>
+            <p>TODO</p>
+            <h4>Datenkorb</h4>
+            <p>TODO</p>
+            <h4>Visualisierung als Diagramme oder Karten</h4>
+            <p>TODO</p>
+            <h4>Exporte in offene Formate</h4>
+            <p>TODO</p>
+        </div>
+    </div><!-- /row marketing -->
+</div><!-- /col-xs-12 -->
diff -r d72e08246c51 -r 5d4b8372729e feed.html
--- a/feed.html	Tue Mar 25 10:53:43 2014 +0100
+++ b/feed.html	Tue Mar 25 11:08:03 2014 +0100
@@ -1,6 +1,6 @@
 <div class="col-xs-6 col-md-4 sidebar-dive4elements">
     <div class="news feed">
         <p>News Feed</p>
-        <!--#exec cgi="newsfeed.py" -->
+        <!--#exec "./nf.py" -->
     </div><!-- /news feed -->
 </div><!-- /col-xs-6 -->


More information about the Dive4Elements-commits mailing list