Merge lp:~terrycojones/fluidinfo-explorer/edit-index-page into lp:fluidinfo-explorer

Proposed by Terry Jones
Status: Merged
Approved by: PA Parent
Approved revision: 108
Merged at revision: 106
Proposed branch: lp:~terrycojones/fluidinfo-explorer/edit-index-page
Merge into: lp:fluidinfo-explorer
Diff against target: 134 lines (+68/-47)
1 file modified
fluiddbexplorer/templates/index.html (+68/-47)
To merge this branch: bzr merge lp:~terrycojones/fluidinfo-explorer/edit-index-page
Reviewer Review Type Date Requested Status
PA Parent (community) Approve
Review via email: mp+52951@code.launchpad.net

Description of the change

Updated the landing page, examples, added logo and links to more stuff.

To post a comment you must log in.
107. By Terry Jones

Updated example on index page to use a different Bach piece.

Revision history for this message
PA Parent (paparent) wrote :

Sounds good. Only thing: My name is written "Pier André Parent" ;)

review: Needs Fixing
Revision history for this message
Terry Jones (terrycojones) wrote :

Fixed.

108. By Terry Jones

Fixed Pier's name

Revision history for this message
PA Parent (paparent) wrote :

Good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'fluiddbexplorer/static/images/logo.png'
2Binary files fluiddbexplorer/static/images/logo.png 1970-01-01 00:00:00 +0000 and fluiddbexplorer/static/images/logo.png 2011-03-11 12:31:43 +0000 differ
3=== modified file 'fluiddbexplorer/templates/index.html'
4--- fluiddbexplorer/templates/index.html 2011-02-26 15:05:45 +0000
5+++ fluiddbexplorer/templates/index.html 2011-03-11 12:31:43 +0000
6@@ -1,55 +1,77 @@
7 <!doctype html>
8 <html>
9 <head>
10- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
11- <title>Fluidinfo Explorer</title>
12-
13- <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="extjs/resources/css/ext-all.css") }}">
14- <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="css/application.css") }}">
15- <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="css/Ext.ux.grid.RowActions.css") }}">
16-
17-{% if config.GOOGLE_ANALYTICS_CODE %}
18-<script type="text/javascript">
19-var _gaq=_gaq||[];_gaq.push(['_setAccount','{{ config.GOOGLE_ANALYTICS_CODE }}']);_gaq.push(['_trackPageview']);
20-(function(){var ga=document.createElement('script');ga.type='text/javascript';ga.async=true;ga.src=('https:'==document.location.protocol?'https://ssl':'http://www')+'.google-analytics.com/ga.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(ga,s);})();
21-</script>
22-{% endif %}
23+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
24+ <title>Fluidinfo Explorer</title>
25+
26+ <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="extjs/resources/css/ext-all.css") }}">
27+ <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="css/application.css") }}">
28+ <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="css/Ext.ux.grid.RowActions.css") }}">
29+
30+ {% if config.GOOGLE_ANALYTICS_CODE %}
31+ <script type="text/javascript">
32+ var _gaq=_gaq||[];_gaq.push(['_setAccount','{{ config.GOOGLE_ANALYTICS_CODE }}']);_gaq.push(['_trackPageview']);
33+ (function(){var ga=document.createElement('script');ga.type='text/javascript';ga.async=true;ga.src=('https:'==document.location.protocol?'https://ssl':'http://www')+'.google-analytics.com/ga.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(ga,s);})();
34+ </script>
35+ {% endif %}
36 </head>
37 <body class="instance-{{ instance }}">
38
39- <div id="logo"><h1>Fluidinfo Explorer{% if instance == 'sandbox' %} (sandbox){% endif %}</h1></div>
40-
41-<div id="welcome" class="x-hidden">
42- <h2>Welcome to Fluidinfo Explorer</h2>
43- {% if rootid == 'nstree-disabled' %}
44- <div class="warning">
45- <strong>Important:</strong> The namespace tree that usually appears on the left has been disabled because you didn't put a starting namespace in the url. Read on to learn more.
46- </div>
47- {% endif %}
48- <h3>What is Fluidinfo Explorer ?</h3>
49- <p>With this tool you can quickly navigate in <a href="http://www.fluidinfo.com" target="_blank">Fluidinfo</a>, using either the namespace tree or via <a href="http://doc.fluidinfo.com/fluidDB/queries.html" target="_blank">Fluidinfo queries</a>.</p>
50- <p>You can explore either the main Fluidinfo instance (the default), or the sandbox, at: <a href="{{ config.BASE_URL }}/sandbox/">{{ config.BASE_URL }}/sandbox/</a></p>
51- <p>To start exploring from a top-level namespace, add it to the URL. Here are some examples:</p>
52- <ul>
53- <li><a href="{{ config.BASE_URL }}/fluiddb/twitter.com">{{ config.BASE_URL }}/fluiddb/twitter.com</a></li>
54- <li><a href="{{ config.BASE_URL }}/fluiddb/epointsystem/scada">{{ config.BASE_URL }}/fluiddb/epointsystem/scada</a></li>
55- </ul>
56- <p>If you don't have a Fluidinfo account, feel free to <a href="http://fluidinfo.com/accounts/new/" target="_blank">create one</a>!</p>
57-
58- <h3>What is Fluidinfo ?</h3>
59- <p><a href="http://www.fluidinfo.com" target="_blank">Fluidinfo</a> is an online "cloud" database. Using a flexible underlying representation of information and a new model of control, it allows users and applications to work with information more naturally. That includes dynamically organizing, sharing, combining and augmenting information, and searching in ways that have previously not been possible. It also allows users to choose exactly which information to share with whom, with separate controls for reading and writing.</p>
60- <p>Fluidinfo lets data be social. It allows almost unlimited information personalization by individual users and applications, and also <em>between</em> them. This makes it simple to build a wide variety of applications that benefit from cooperation, and which are open to unanticipated future enhancements. Even more importantly, Fluidinfo facilitates and encourages the growth of applications that leave users in control of their own data.</p>
61-
62- <h3>How it's built</h3>
63- <p>Fluidinfo Explorer uses these:</p>
64- <ul>
65- <li><a href="http://www.fluidinfo.com" target="_blank">Fluidinfo</a></li>
66- <li><a href="https://launchpad.net/fom" target="_blank">FOM</a></li>
67- <li><a href="http://www.extjs.com" target="_blank">ExtJS</a></li>
68- <li><a href="http://flask.pocoo.org" target="_blank">Flask</a></li>
69- <li><a href="http://gunicorn.org" target="_blank">Gunicorn</a></li>
70- <li><a href="http://nginx.org" target="_blank">nginx</a></li>
71- </ul>
72+ <div id="logo"><h1>Fluidinfo Explorer{% if instance == 'sandbox' %} (sandbox){% endif %}</h1></div>
73+
74+ <div id="welcome" class="x-hidden">
75+ <img src="{{ url_for('static', filename="images/logo.png") }}">
76+ <p/>
77+ <h2>Welcome to the Fluidinfo Explorer</h2>
78+ <p>The Fluidinfo Explorer lets you quickly navigate information stored in
79+ <a href="http://fluidinfo.com" target="_blank">Fluidinfo</a>. You
80+ can navigate via a namespace tree, examine individual Fluidinfo
81+ objects, or use <a href="http://doc.fluidinfo.com/fluidDB/queries.html"
82+ target="_blank">Fluidinfo queries</a> to see matching objects. You
83+ can explore either the main Fluidinfo instance (the default), or the
84+ sandbox, at: <a href="{{ config.BASE_URL }}/sandbox/">{{
85+ config.BASE_URL }}/sandbox/</a>.</p>
86+
87+ <p>To start exploring from a top-level namespace, add it to the URL as
88+ in these examples:</p>
89+ <ul>
90+ <li><a href="http://www.oreilly.com">O'Reilly</a> books and authors:
91+ <a href="{{ config.BASE_URL }}/fluidinfo/oreilly.com">{{ config.BASE_URL }}/fluidinfo/oreilly.com</a></li>
92+ <li><a href="http://www.readwriteweb.com">ReadWriteWeb</a> articles:
93+ <a href="{{ config.BASE_URL }}/fluidinfo/readwriteweb.com">{{ config.BASE_URL }}/fluidinfo/readwriteweb.com</a></li>
94+ </ul>
95+
96+ <p>To look at a particular object, add it to the URL either with an
97+ about value or an object ID as in the following examples:</p>
98+ <ul>
99+ <li>Python in a Nutshell (second edition):
100+ <a href="{{ config.BASE_URL }}/fluidinfo/about/book:python%20in%20a%20nutshell%20second%20edition%20(alex%20martelli)">{{ config.BASE_URL }}/fluidinfo/about/book:python in a nutshell second edition (alex martelli)</a></li>
101+ <li>Bach's first cello suite in G Major (BWV 1007):
102+ <a href="{{ config.BASE_URL }}/fluidinfo/about/BWV1007">{{ config.BASE_URL }}/fluidinfo/about/BWV1007</a></li>
103+ <li>The object keeping track of entries in the O'Reilly API competition: <a href="{{ config.BASE_URL }}/fluidinfo/object/5783673e-766c-40d6-b697-4d283adec430">{{ config.BASE_URL }}/fluidinfo/object/5783673e-766c-40d6-b697-4d283adec430</a></li>
104+ </ul>
105+
106+ <h3>To learn more...</h3>
107+ <p>You can learn more about using the explorer from our blog post
108+ <a href="http://blogs.fluidinfo.com/fluidinfo/2011/01/10/introducing-the-fluiddb-explorer/">Introducing the Fluidinfo Explorer</a>.
109+
110+ If you want to use the explorer to add information to Fluidinfo,
111+ you'll need to
112+ <a href="http://fluidinfo.com/accounts/new/" target="_blank">create an account</a>.
113+
114+ And of course you can also visit our web site to learn more
115+ about <a href="http://fluidinfo.com" target="_blank">Fluidinfo</a> in
116+ general.</p>
117+
118+ <p>The explorer was written by <a href="http://twitter.com/paparent">Pier Andr&eacute; Parent</a> using
119+ <a href="http://doc.fluidinfo.com/fluidDB/api/index.html" target="_blank">the Fluidinfo API</a>,
120+ <a href="https://launchpad.net/fom" target="_blank">FOM</a>,
121+ <a href="http://www.extjs.com" target="_blank">ExtJS</a>,
122+ <a href="http://flask.pocoo.org" target="_blank">Flask</a>,
123+ <a href="http://gunicorn.org" target="_blank">Gunicorn</a>,
124+ and
125+ <a href="http://nginx.org" target="_blank">nginx</a>.
126+ </p>
127 </div>
128
129 {% if config.DEBUG %}
130@@ -101,4 +123,3 @@
131
132 </body>
133 </html>
134-

Subscribers

People subscribed via source and target branches