More updates

Author: rozza

_config.yml

@@ -70,9 +70,9 @@ JB :
   # These paths are to the main pages Jekyll-Bootstrap ships with.
   # Some JB helpers refer to these paths; change theme here if needed.
   #
-  archive_path: /archive.html
-  categories_path : /categories.html
-  tags_path : /tags.html
+  # archive_path: /archive.html
+  # categories_path : /categories.html
+  # tags_path : /tags.html
 
   # Settings for comments helper
   # Set 'provider' to the comment provider you want to use.
@@ -96,14 +96,14 @@ JB :
   # Set 'provider' to the analytics provider you want to use.
   # Set 'provider' to false to turn analytics off globally.
   #
-  analytics :
-    provider : google
-    google :
-        tracking_id : 'UA-123-12'
-    getclicky :
-      site_id :
-    mixpanel :
-        token : '_MIXPANEL_TOKEN_'
+  # analytics :
+  #   provider : google
+  #   google :
+  #       tracking_id : 'UA-123-12'
+  #   getclicky :
+  #     site_id :
+  #   mixpanel :
+  #       token : '_MIXPANEL_TOKEN_'
 
   # Settings for sharing helper.
   # Sharing is for things like tweet, plusone, like, reddit buttons etc.

_includes/themes/mongoengine/default.html

@@ -46,14 +46,13 @@
       <div class="content">
         {{ content }}
       </div>
+    </div> <!-- /container -->
 
-      <footer>
+      <footer class=" footer">
         <p>&copy; mongoengine
         </p>
       </footer>
 
-    </div> <!-- /container -->
-
     <script src="{{ ASSET_PATH }}/js/jquery.js"></script>
     <script src="{{ ASSET_PATH }}/bootstrap/js/bootstrap-tabs.js"></script>
     <script src="{{ ASSET_PATH }}/js/github.commits.widget.js"></script>

_includes/themes/mongoengine/frontpage.html

@@ -4,7 +4,7 @@ <h1 class="logo">MongoEngine</h1>
 
 <div class="row">
   <div class="span12 strapline">
-      <p>A object-document mapper to connect Python and MongoDB</p>
+      <p>The object-document mapper to connect Python and MongoDB</p>
   </div>
 </div>
 
@@ -63,7 +63,7 @@ <h3>Roadmap released</h3>
               <li>Raw method for pyMongo</li>
             </ul>
             For more information see:
-            <a href="https://groups.google.com/d/topic/mongoengine-users/Or_LkpB5WYQ/discussion">Roadmap</a>
+             <a href="/roadmap.html">Roadmap</a>
           </p>
           <h3>MongoEngine v0.6 Released</h3>
           <p>Just to let you know 0.6 has been released!
@@ -115,7 +115,7 @@ <h2><a name="getting-started"></a>Getting Started</h2>
       </p>
     </div>
     <div class="span5">
-    <h3>Dependancies</h3>
+    <h3 class="first">Dependancies</h3>
     <ul class="decorated">
         <li><a href="http://api.mongodb.org/python/">pymongo 1.1+</a></li>
         <li><a href="http://sphinx.pocoo.org/">sphinx</a> (optional, for documentation
@@ -138,7 +138,7 @@ <h2><a name="source"></a>Source</h2>
        <p><code>git clone git://github.com/mongoengine/mongoengine.git</code></p>
     </div>
     <div class="span5">
-      <h3>Contributing</h3>
+      <h3 class="first">Contributing</h3>
       <p>To contribute to the project, fork it on GitHub and
       send a pull request, all contributions and suggestions are
       welcome!</p>
@@ -187,6 +187,5 @@ <h3>Github</h3>
       }).render().start();
       </script>
     </div>
-    </div>
   </div>
 </div>

_includes/themes/mongoengine/page.html

@@ -1,5 +1,9 @@
 <div class="page-header">
-  <h1>{{ page.title }} <small>{{ page.tagline }}</small></h1>
+  <h1 class="logo">MongoEngine</h1>
+</div>
+
+<div class="page-header-secondary">
+  <h2>{{ page.title }} <small>{{ page.tagline }}</small></h2>
 </div>
 
 <div class="row">

assets/themes/mongoengine/css/style.css

@@ -65,6 +65,10 @@ h3 {
     margin-bottom: 0.6em;
 }
 
+h3.first {
+  margin-top: -1em;
+}
+
 /* nav bar ================ */
 .navbar {
   border-top: 1px solid #e4e4e4;
@@ -126,7 +130,7 @@ h3 {
   font-size: 1.70em;
   line-height: 2.25em;
   text-align: center;
-  color: #291902;
+  color: #fff;
   text-shadow: 0 1px 1px #957e62;
   margin: 0;
 }
@@ -162,10 +166,14 @@ h3 {
 }
 
 
-.container > footer {
+footer {
   margin-top: 20px;
+  background-color: #F7F7F9;
+  border: 1px solid #E1E1E8;
+  padding: 10px 0;
+  color: #444;
 }
-.container > footer p {
+footer p {
   text-align: center; /* center align it with the container */
 }
 

assets/themes/mongoengine/js/github.commits.widget.js

@@ -1114,17 +1114,18 @@ function bit_rol(num, cnt)
                     if (differenceInDays == 0) {
                         var differenceInHours = Math.floor(((todayTime - commitTime)/(3600*1000)));
                         if (differenceInHours == 0) {
-                            var differenceInMinutes = Math.floor(((todayTime - commitTime)/(600*1000)));
+                            var differenceInMinutes = Math.floor(((todayTime - commitTime)/(60*1000)));
                             if (differenceInMinutes == 0) {
-
                                 return 'just now';
                             }
-
-                            return 'about ' + differenceInMinutes + ' minutes ago';
+                            console.log(todayTime, commitTime, (todayTime - commitTime))
+                            var plural = differenceInMinutes > 1 ? 's' : ''
+                            return 'about ' + differenceInMinutes + ' minute' + plural + ' ago';
                         }
 
-                        return 'about ' + differenceInHours + ' hours ago';
-                    }else if (differenceInDays == 1) {
+                        var plural = differenceInHours > 1 ? 's' : ''
+                        return 'about ' + differenceInHours + ' hour' + plural + ' ago';
+                    } else if (differenceInDays == 1) {
                         return 'yesterday';
                     }
                     return differenceInDays + ' days ago';

roadmap.md

@@ -0,0 +1,53 @@
+---
+layout: page
+title: "Roadmap"
+tagline: "upcoming and new"
+---
+{% include JB/setup %}
+
+Initially published on the [mongoengine-users](https://groups.google.com/d/topic/mongoengine-users/Or_LkpB5WYQ/discussion) usergroup.
+
+### 0.7
+
+- Performance - Dirty data tracking
+- Allow inheritance default to off
+- Chainable QuerySet slice
+- Serialization / deserialization
+- Raw method for pyMongo
+
+See [github](https://github.com/hmarr/mongoengine/issues?milestone=4&state=open) for all the issues assigned to the 0.7 (not all will make it).
+
+### 0.8
+
+- Performance - Configurable lazy references
+- Transparent pymongo connections - lazy ones at that :)
+- Bug fixes
+- Code quality
+
+### 0.9
+
+- Python 3 support
+- Test refactor
+- Polish and clean
+- Website
+
+### 1.0 - Party! :)
+
+Anything missing or you would like in - let me know!
+
+## MongoEngine framework support
+
+MongoEngine is used with various different frameworks and there are numerous projects out there for integration in varying states of completeness.  I would like to bring framework support into the project - so that we can provide similar levels of functionality to whichever framework you are using.
+
+At the weekend I did a quick review and found:
+
+* Django has 6 projects on Github providing Forms, Views, Admin and debug toolbar support.
+* Flask has 2 projects providing Generic Views, Forms and Debug toolbar support
+* Pyramid has a project providing project scaffolding.
+* Bottle has a project / example for integration
+
+I will need help from the community with this and I will be reaching out to people who have already published code on github.  If you are interested let me know!
+
+To help with this I have added a new organisation in Github: http://github.com/mongoengine - this will host the code going forward (don't worry any changes to the core will be pushed upstream to http://github.com/hmarr/mongoengine/) I'm hoping that all the new framework libraries will be hosted under this organisation so that they are easy to find and cross repository issues can be tracked.
+
+I'm really excited about pushing towards getting MongoEngine to 1.0 and with your help we'll get there soon, I would also love some feedback - anything you think MongoEngine could do better / shouldn't be doing let me know!