firepad + others WIP

README.md

@@ -150,7 +150,25 @@ Access from your browser
 
 http://localhost:5000
 
+## Templating
 
+Realms uses handlebars partials to create templates.
+Each page that you create is a potential partial.
+
+Let's create the following partial:
+
+http://localhost:5000/_create/my-partial
+
+    <div class="panel panel-default">
+      <div class="panel-heading">{{ heading }}</div>
+      <div class="panel-body">
+        {{ body }}
+      </div>
+    </div>
+
+Don't forget to save it.
+
+Now 
 ## Author
 
 Matthew Scragg <scragg@gmail.com>

bower.json

@@ -1,18 +1,19 @@
 {
-    "name": "realms",
-    "version": "0.1.2",
-    "dependencies": {
-        "components-bootstrap": "~3.2.0",
-        "components-font-awesome": "~4.2.0",
-        "jquery": "~1.11.1",
-        "highlightjs": "~8.0.0",
-        "handlebars": "~2.0.0",
-        "keymaster": "madrobby/keymaster",
-        "ace-builds": "~1.1.6",
-        "parsleyjs": "~2.0.3",
-        "marked": "~0.3.2",
-        "js-yaml": "~3.2.1",
-        "localforage": "~0.9.2",
-        "bootswatch-dist": "3.2.0-flatly"
-    }
+  "name": "realms",
+  "version": "0.1.2",
+  "dependencies": {
+    "components-bootstrap": "~3.2.0",
+    "components-font-awesome": "~4.2.0",
+    "jquery": "~1.11.1",
+    "highlightjs": "~8.0.0",
+    "handlebars": "~2.0.0",
+    "keymaster": "madrobby/keymaster",
+    "ace-builds": "~1.1.6",
+    "parsleyjs": "~2.0.3",
+    "marked": "~0.3.2",
+    "js-yaml": "~3.2.1",
+    "store-js": "~1.3.16",
+    "bootswatch-dist": "3.2.0-flatly",
+    "bootbox": "4.3.0"
+  }
 }

realms/config/__init__.py

@@ -52,7 +52,6 @@ def save(conf):
 #CACHE_TYPE = 'memcached'
 CACHE_MEMCACHED_SERVERS = ['127.0.0.1:11211']
 
-
 # Get ReCaptcha Keys for your domain here:
 # https://www.google.com/recaptcha/admin#whyrecaptcha
 RECAPTCHA_ENABLE = False
@@ -75,6 +74,12 @@ def save(conf):
 # Used by Flask-Login
 LOGIN_DISABLED = ALLOW_ANON
 
+# None, firepad, or togetherjs
+COLLABORATION = 'togetherjs'
+
+# Required for firepad
+FIREBASE_HOSTNAME = None
+
 # Page names that can't be modified
 WIKI_LOCKED_PAGES = []
 # Depreciated variable name

realms/modules/wiki/assets.py

@@ -1,7 +1,8 @@
 from realms import assets
 
 assets.register('editor.js',
-                'vendor/localforage/dist/localforage.js',
+                'vendor/store-js/store.js',
+                'vendor/bootbox/bootbox.js',
                 'vendor/ace-builds/src/ace.js',
                 'vendor/ace-builds/src/mode-markdown.js',
                 'vendor/ace-builds/src/ext-keybinding_menu.js',

realms/modules/wiki/models.py

@@ -139,11 +139,11 @@ def get_page(self, name, sha='HEAD'):
             return cached
 
         # commit = gittle.utils.git.commit_info(self.repo[sha])
-        name = self.cname_to_filename(name).encode('latin-1')
+        filename = self.cname_to_filename(name).encode('latin-1')
         sha = sha.encode('latin-1')
 
         try:
-            data = self.gittle.get_commit_files(sha, paths=[name]).get(name)
+            data = self.gittle.get_commit_files(sha, paths=[filename]).get(filename)
             if not data:
                 return None
             partials = {}
@@ -153,6 +153,7 @@ def get_page(self, name, sha='HEAD'):
                     for partial_name in meta['import']:
                         partials[partial_name] = self.get_page(partial_name)
             data['partials'] = partials
+            data['info'] = self.get_history(name, limit=1)[0]
             return data
 
         except KeyError:
@@ -175,10 +176,10 @@ def compare(self, name, old_sha, new_sha):
         new = self.get_page(name, sha=new_sha)
         return ghdiff.diff(old['data'], new['data'])
 
-    def get_history(self, name):
+    def get_history(self, name, limit=100):
         file_path = self.cname_to_filename(name)
         versions = []
-        walker = self.repo.get_walker(paths=[file_path], max_entries=100)
+        walker = self.repo.get_walker(paths=[file_path], max_entries=limit)
         for entry in walker:
             change_type = None
             for change in entry.changes():

realms/modules/wiki/views.py

@@ -74,7 +74,12 @@ def edit(name):
             name = remove_ext(data['name'])
             content = data.get('data')
             g.assets['js'].append('editor.js')
-            return render_template('wiki/edit.html', name=name, content=content, sha=data.get('sha'), partials=data.get('partials'))
+            return render_template('wiki/edit.html',
+                                   name=name,
+                                   content=content,
+                                   info=data.get('info'),
+                                   sha=data.get('sha'),
+                                   partials=data.get('partials'))
         else:
             return redirect(url_for('wiki.create', name=cname))
 
@@ -110,7 +115,10 @@ def create(name):
             return redirect(url_for('wiki.edit', name=cname))
 
         g.assets['js'].append('editor.js')
-        return render_template('wiki/edit.html', name=cname, content="")
+        return render_template('wiki/edit.html',
+                               name=cname,
+                               content="",
+                               info={})
 
 
 @blueprint.route("/", defaults={'name': 'home'})

realms/static/css/style.css

@@ -186,7 +186,7 @@ a.label {
   right: 0;
   bottom: 0;
   left: 0;
-  padding: 40px 10px 10px 10px;
+  padding: 45px 10px 10px 10px;
   overflow: auto;
   //word-break: break-word;
   cursor: default;
@@ -217,7 +217,7 @@ a.label {
   background-color: #eee;
 }
 
-#editor {
+.editor {
   margin-top: 40px;
 }
 
@@ -226,7 +226,7 @@ a.label {
     padding: 3px;
   }
 
-  #editor {
+  .editor {
     margin-top: 0;
   }