images for news page, footer

Author: meli-lewis

.gitignore

@@ -38,7 +38,7 @@ nosetests.xml
 *.mo
 .idea
 env
-
+.env
 # Python
 #######################
 frozen

main.py

@@ -15,9 +15,9 @@
 
 
 if __name__ == "__main__":
-    app.run(port=5000, debug=True) # Ready to serve Flask app from the templates in www
+    #app.run(port=5000, debug=True) # Ready to serve Flask app from the templates in www
 
     # or
 
-    #static_app = w.freeze('./frozen')
-    #static_app.run(port=5000, debug=False) # Ready to serve Flask app that mimics a static server
+    static_app = w.freeze('./frozen')
+    static_app.run(port=5000, debug=False) # Ready to serve Flask app that mimics a static server

www/_footer.mako

@@ -1,6 +1,13 @@
 <style>
+<<<<<<< HEAD
     a img {
         padding: 0px 0px 10px 0px;
+=======
+    .icon {
+        width:32px;
+        height:32px;
+        padding:4px;
+>>>>>>> 53a9cf63aacde504cb90ee9da8056eb9f2828138
     }
 </style>
 
@@ -10,16 +17,26 @@
                     <div class="span1">
                         <p>&nbsp;</p>
                     </div>
+<<<<<<< HEAD
                     <div class="span3">
                         <h4>Open Science Framework</h4>
+=======
+                    <div class="span2">
+                        <h5>Open Science Framework</h5>
+>>>>>>> 53a9cf63aacde504cb90ee9da8056eb9f2828138
                         <ul>
                             <li><a href="http://openscienceframework.org/project/4znZP/wiki/home">About</a></li>
                             <li><a href="http://openscienceframework.org/faq/">FAQ</a></li>
                             <li><a href="http://openscienceframework.org/explore/activity/">Explore</a></li>
                         </ul>
                     </div>
+<<<<<<< HEAD
                     <div class="span3">
                         <h4>Center for Open Science</h4>
+=======
+                    <div class="span2">
+                        <h5>Center for Open Science</h5>
+>>>>>>> 53a9cf63aacde504cb90ee9da8056eb9f2828138
                         <ul>
                             <li><a href="/#contact">Contact</a></li>
                             <li><a href="/jobs/">Jobs</a></li>
@@ -28,6 +45,7 @@
                         </ul>
                     </div>
                     <div class="span2">
+<<<<<<< HEAD
                         <h4>Socialize</h4>
                         <div style="padding-right:40px;">
                             <a href="http://twitter.com/OSFramework"><img src="/static/twitter_alt.png" alt="Twitter" height="24" width="24"></a>
@@ -44,6 +62,28 @@
             <div class="row">
                 <div class="span12">
                 <p style="font-size: 10px;"><a rel="license" href="http://creativecommons.org/licenses/by-nc/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0; margin-right: 5px;" src="http://i.creativecommons.org/l/by-nc/3.0/80x15.png" /></a> This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc/3.0/deed.en_US">Creative Commons Attribution-NonCommercial 3.0 Unported License</a>.</a></p>
+=======
+                        <h5>Socialize</h5>
+                        <a href="https://groups.google.com/forum/#!forum/openscienceframework"><img class="icon" src="/static/groups.png" alt="google icon"</a>
+                        <a href="http://twitter.com/OSFramework"><img class="icon" src="/static/twitter.png" alt="twitter icon" </a>
+                        <a href="https://www.facebook.com/OpenScienceFramework"><img class="icon" src="/static/facebook.png" alt="facebook icon" </a>
+                        <a href="https://plus.google.com/103557785986281627994" rel="publisher"><img class="icon" src="/static/google+.png" alt="google+ icon" </a>
+                        <a href="www.linkedin.com/company/center-for-open-science"><img class="icon" src="/static/linkedin.png" alt="linkedin icon"</a>
+                        <!-- <ul>
+                            <li><a href="https://groups.google.com/forum/#!forum/openscienceframework">OSC Google Group</a></li>
+                            <li><a href="http://twitter.com/OSFramework">Twitter</a></li>
+                            <li><a href="https://www.facebook.com/OpenScienceFramework">Facebook</a></li>
+                            <li><a href="https://plus.google.com/103557785986281627994" rel="publisher">Google+</a></li>
+                        </ul> -->
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="container copyright">
+            <div class="row">
+                <div class="span12">
+                <p>Copyright &copy; 2011-2013 <a href="http://centerforopenscience.org">CenterforOpenScience.org</a></p>
+>>>>>>> 53a9cf63aacde504cb90ee9da8056eb9f2828138
                 </div>
             </div>
         </div>

www/developers.mako

@@ -19,11 +19,10 @@
 
         <h4>Grants and Bounties</h4>
 
-        <p>The Center for Open Science (COS) occasionally invites grant proposals or specific project bounties to increase the openness, integrity, and reproducibility of scientific research. Proposals can aim to (1) create or connect open science infrastructure, (2) enable or incentivize new practices by scientists, societies, journals, funders, libraries, or other stakeholders in science, or (3) conduct metascience research with implications for improving scientific practices. <a href="http://centerforopenscience.org/grants/">Find out more</a>.</p>
+        <p>The Center for Open Science (COS) occasionally invites grant proposals or specific project bounties to increase the openness, integrity, and reproducibility of scientific research. Proposals can aim to (1) create or connect open science infrastructure, (2) enable or incentivize new practices by scientists, societies, journals, funders, libraries, or other stakeholders in science, or (3) conduct metascience research with implications for improving scientific practices. <a href="/grants/">Find out more</a>.</p>
          </span>
-         </div>
-    </div> <!-- placement -->
-</div> <!-- row -->
+         </div> <!-- text -->
+    </div> <!-- row -->
 
 <ul class="breadcrumb">
     <li><a href="/">Home</a> <span class="divider">/</span></li>

www/grants.mako

@@ -2,7 +2,6 @@
 
 <h3>Grant Giving</h3>
 
-
 <p>The Center for Open Science (COS) occasionally invites grant proposals to increase the openness, integrity, and reproducibility of scientific research.  Proposals can aim to (1) create or connect open science infrastructure, (2) enable or incentivize new practices by scientists, societies, journals, funders, libraries, or other stakeholders in science, or (3) conduct metascience research with implications for improving scientific practices.</p>
 <p>Project proposals are solutions-oriented.  COS does not fund meetings to write more academic papers suggesting that someone should do something.  COS funds the projects by the someone that does the something.</p>
 <p>COS priorities are to (1) make the entire scientific workflow accessible, (2) increase scientists&#8217; accountability, (3) facilitate good practices by scientists, (4) increase reward for good practices, and (5) promote reproducibility of scientific findings.</p>