Changeset 233

Timestamp:

09/15/09 17:50:28 (11 years ago)

Author:

sander

Message:

About page and most pages now also have the new styling

Location:

branches/design/server/www/app

Files:

• views/pages/about.ctp (modified) (2 diffs)
• views/requests/add.ctp (modified) (1 diff)
• webroot/css/cake.override.css (modified) (4 diffs)
• webroot/img/mailinglist.png (added)
• webroot/img/nlnet.png (added)
• webroot/img/noiv.png (added)
• webroot/img/opendoc.png (added)
• webroot/img/places/icon-about.png (added)
• webroot/img/places/icon-empty.png (added)
• webroot/img/sand-swirl.jpg (added)
• webroot/img/thanks.png (deleted)

branches/design/server/www/app/views/pages/about.ctp

@@ -1 @@
-<h2>Officeshots.org</h2>
 <h3>Creates transparency in the Office market.</h3>
 
-        <p><em>An online service where end users and professionals can compare the output of different office suites - for their own
-        documents!</em></p>
+<div class="column-right">
+
+        <div class="polaroid">
+                <div id="mailinglist">
+                        <h3>Register for the mailing list</h3>
+                        <p>If you are interested in this project, why don't you register for the mailing list available for the Officeshots.org project?
+                        Provide input to the developers, ask for features - that's what its for.</p>
+                        <p style="text-align:center;"> &raquo; <a href="http://lists.opendocsociety.org/mailman/listinfo/officeshots">register</a></p>
+                </div>
+        </div>
+
+        <div id="thanks">
+                <h3>An initiative of</h3>
+                <img src="/img/noiv.png" alt="Nederland in open verbinging logo" /><br />
+                <img src="/img/opendoc.png" alt="OpenDoc Society logo" /><br />
+                <img src="/img/nlnet.png" alt="NLNet Foundation logo" /><br />
+        </div>
+</div>
+
+<p><em>An online service where end users and professionals can compare the output of different office suites - for their own
+documents!</em></p>
 
 <p>A thousand flowers are blossoming in the world of productivity tools, thanks to the rise of open standards like the <A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">Open Document Format</A> (ISO 26300:2006) for storing and sharing content. Innovation is taking place where it was once thought impossible. With diversity comes choice, but also the need to make sure you are working with the best-of-breed solutions - wether they are open source, freeware, software-as-a-service or paid solutions. </p>
-
-<div style="float:right; width:40%; margin-left:10px; margin-right:10px; padding:5px; margin-top:0px; border: 1px gray dashed;"><h3>Register for the mailing list</h3><P>If you are interested in this project, why don't you register for the mailing list available for the Officeshots.org project? Provide input to the developers, ask for features - that's what its for.</P><p style="text-align:center;"> >> <A href="http://lists.opendocsociety.org/mailman/listinfo/officeshots">register</A></p></div>
 
 <p>A document may look nice on your screen while you are working on it in its native application, but that is just the outside. If the exchange formats are not implemented correctly, it might look like a sloppy mess to the person receiving the business proposal, invoice or report you worked so hard on. Officeshots.org was inspired by an open source project from the web standards world called <A href="http://www.browsershots.org">browsershots.org</A>. 
@@ -16 +32 @@
 <p>After submitting a document to officeshots.org, the site will deliver the print, screen and code output as produced by a variety of different productivity applications - in different versions and across operating system platforms. Anyone can upload ODF-documents, at no cost. This is because officeshots.org actually divides the work among rendering servers hosted by vendors and the community. That could be you (if you're interested, <A href="mailto:info@opendocsociety.org">contact us</A> or look here to see the <a href="http://docs.officeshots.org">technical documentation</a>).</p>
 
-<h3>When can I try it</h3>
-<p><strong>Currently we are running a closed beta, exclusively available to members and sponsors of OpenDoc Society (<A href="http://www.opendocsociety.org">join</A> or even beter, <A href="http://www.opendocsociety.org">become a sponsor</a>!). A public beta and additional service will be available in June 2009. Officeshots.org is an initiative by <a href="http://www.opendocsociety.org">OpenDoc Society</a> and the <a href="http://www.noiv.nl">Netherlands in Open Connection</a>-program from the Netherlands government. Officeshots.org is sponsored by NLnet foundation, and is developed as an open source (Affero GPLv3-licenced) project in a team lead by Sander Marechal from <a href="http://www.jejik.com">Lone Wolves</a>. </strong></p>
-
-<br /><br /><img src="/img/thanks.png" id="sponsors" />
+<p>Officeshots.org is an initiative by <a href="http://www.opendocsociety.org">OpenDoc Society</a> and the <a href="http://www.noiv.nl">Netherlands in Open Connection</a>-program from the Netherlands government. Officeshots.org is sponsored by NLnet foundation, and is developed as an open source (Affero GPLv3-licenced) project in a team lead by Sander Marechal from <a href="http://www.jejik.com">Lone Wolves</a>.</p>

branches/design/server/www/app/views/requests/add.ctp

@@ -92 +92 @@
                                 echo $form->button(__('Upload', true), array('type' => 'submit', 'id' => 'RequestFileSubmit'));
                         } else {
-                                __('Officeshots is in closed beta. You need to <a href="/users/login">login</a> or <a href="/users/register">register</a> before you can upload documents.');
+                                echo '<p>' . __('Officeshots is in closed beta. You need to <a href="/users/login">login</a> or <a href="/users/register">register</a> before you can upload documents.', true) . '</p>';
                                 echo $form->file('Request.FileUpload', array('disabled' => true));
                                 echo $form->button(__('Upload', true), array('type' => 'submit', 'disabled' => true, 'id' => 'RequestFileSubmit'));

branches/design/server/www/app/webroot/css/cake.override.css

@@ -78 +78 @@
 }
 
+/* Generic right column */
+.column-right {
+        display: block;
+        float: right;
+        width: 20em;
+        margin-left: 2em;
+}
+
+/* Generic polaroid border wrapper */
+.polaroid {
+        display: block;
+        padding: 4px;
+        border: 1px solid #bbb;
+        -moz-border-radius: 5px;
+}
+
 /* Upload request */
 #upload {
@@ -114 +130 @@
         width: auto;
         display: inline;
+        margin-top: 0.5em;
         margin-bottom: 0.5em;
 }
@@ -126 +143 @@
         margin: 0 3em;
         padding: 4px;
-        border: 1px double #bbb;
+        border: 1px solid #bbb;
         -moz-border-radius: 5px;
         color: #eee;
@@ -178 +195 @@
         border: none;
         color: #eee;
+        text-align: left;
 }
 
 #applications tr td { font-size: 9pt; }
 
-#applications input { margin: 0 4px 0 0; }
+#applications input { margin: 0 6px 0 0; }
+
+/* Mailinglist registration callout */
+#mailinglist {
+        border: 1px solid #aaa;
+        padding: 1em;
+        background: #333 url(/img/sand-swirl.jpg) no-repeat scroll 45% 55%;
+        color: #fff;
+}
+
+#mailinglist h3 {
+        padding-top: 52px;
+        background: transparent url(/img/mailinglist.png) no-repeat scroll top right;
+        color: #adceff; 
+        font-size: large;
+}
+
+#mailinglist a {
+        color: #adceff; 
+}
+
+/* Sponsor icons */
+#thanks { text-align: center; }
+
+#thanks img { margin-top: 1em; }
 
 /* Generic overrides */
 form { width: 100%; }
 ul, ol { margin: 1em 0 0 4em; }
+a { color: #17509d; text-decoration: none; }
+a:hover { color: #17509d; text-decoration: underline; }
+h1, h2, h3, h4 { color: #006bbe; }