Merge branch 'master' of git://github.com/nursix/eden

Conflicts:
	VERSION
	static/styles/S3/sahana.css
	views/default/index.html

.gitignore

@@ -21,4 +21,5 @@
 *.ttf
 .~lock.*.csv#
 *.log
-*.pyc
+*.pyc
+*.~*~

ABOUT

@@ -1,5 +1,5 @@
-Sahana Eden is an Emergency Development Environment - an Open Source framework to rapidly build powerful applications for Emergency Management.
-
-It is a web based collaboration tool that addresses the common coordination problems during a disaster from finding missing people, managing aid, managing volunteers, tracking camps effectively between Government groups, the civil society (NGOs) and the victims themselves.
-
-Please see the website for more details: http://eden.sahanafoundation.org/
+Sahana Eden is an Emergency Development Environment - an Open Source framework to rapidly build powerful applications for Emergency Management.
+
+It is a web based collaboration tool that addresses the common coordination problems during a disaster from finding missing people, managing aid, managing volunteers, tracking camps effectively between Government groups, the civil society (NGOs) and the victims themselves.
+
+Please see the website for more details: http://eden.sahanafoundation.org/

INSTALL

@@ -1,5 +1,5 @@
-Sahana Eden
------------
-This package is designed to be uploaded into a running instance of Web2Py:
-
-http://eden.sahanafoundation.org/wiki/InstallationGuidelines
+Sahana Eden
+-----------
+This package is designed to be uploaded into a running instance of Web2Py:
+
+http://eden.sahanafoundation.org/wiki/InstallationGuidelines

LICENSE

@@ -1,24 +1,24 @@
-http://en.wikipedia.org/wiki/MIT_License
-
-Copyright: 2010 (c) Sahana Software Foundation
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+http://en.wikipedia.org/wiki/MIT_License
+
+Copyright: 2010 (c) Sahana Software Foundation
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

README

@@ -1,5 +1,5 @@
-Sahana Eden is an Emergency Development Environment - an Open Source framework to rapidly build powerful applications for Emergency Management.
-
-It is a web based collaboration tool that addresses the common coordination problems during a disaster from finding missing people, managing aid, managing volunteers, tracking camps effectively between Government groups, the civil society (NGOs) and the victims themselves.
-
-Please see the website for more details: http://eden.sahanafoundation.org/
+Sahana Eden is an Emergency Development Environment - an Open Source framework to rapidly build powerful applications for Emergency Management.
+
+It is a web based collaboration tool that addresses the common coordination problems during a disaster from finding missing people, managing aid, managing volunteers, tracking camps effectively between Government groups, the civil society (NGOs) and the victims themselves.
+
+Please see the website for more details: http://eden.sahanafoundation.org/

controllers/sync.py

@@ -1,144 +1,144 @@
-# -*- coding: utf-8 -*-
-
-"""
-    Synchronisation, Controllers
-
-    @author: Dominic König <dominic[at]aidiq[dot]com>
-"""
-
-module = request.controller
-prefix = "sync" # common table prefix
-module_name = T("Synchronization")
-
-# Options Menu (available in all Functions' Views)
-s3_menu(module)
-
-# -----------------------------------------------------------------------------
-def index():
-    """ Module's Home Page """
-
-    response.title = module_name
-    return dict(module_name=module_name)
-
-# -----------------------------------------------------------------------------
-def config():
-    """ Synchronization Settings Controller """
-
-    resourcename = "config"
-
-    # Get the record ID of the first and only record
-    s3mgr.load("sync_config")
-    table = db.sync_config
-    record = db().select(table.id, limitby=(0, 1)).first()
-    if not record:
-        record_id = table.insert()
-    else:
-        record_id = record.id
-
-    # Can't do anything else than update here
-    r = s3mgr.parse_request(args=[str(record_id), "update"],
-                            extension="html")
-
-    output = r(list_btn=None)
-    return output
-
-# -----------------------------------------------------------------------------
-def repository():
-    """ Repository Management Controller """
-
-    resourcename = "repository"
-
-    tabs = [(T("Configuration"), None),
-            (T("Resources"), "task"),
-            (T("Schedule"), "job"),
-            (T("Log"), "log"),
-            #(T("Conflicts"), "conflict")
-           ]
-
-    s3mgr.model.set_method("sync", "repository",
-                           method="register",
-                           action=s3mgr.sync)
-
-    def prep(r):
-        if r.interactive:
-            if r.component and r.id:
-                if r.component.alias == "job":
-                    current.s3task.configure_tasktable_crud(
-                        function="sync_synchronize",
-                        args = [r.id],
-                        vars = dict(user_id = auth.user.id))
-                response.s3.cancel = URL(c="sync", f="repository",
-                                         args=[str(r.id), r.component.alias])
-        return True
-    response.s3.prep = prep
-
-    def postp(r, output):
-        if r.interactive and r.id:
-            if r.component and r.component.alias == "job":
-                response.s3.actions = [
-                    dict(label=str(T("Reset")),
-                         _class="action-btn",
-                         url=URL(c="sync", f="repository",
-                                 args=[str(r.id), "job", "[id]", "reset"]))
-                    ]
-        s3_action_buttons(r)
-        return output
-    response.s3.postp = postp
-
-    rheader = lambda r: sync_rheader(r, tabs=tabs)
-    output = s3_rest_controller(prefix, resourcename, rheader=rheader)
-    return output
-
-# -----------------------------------------------------------------------------
-def sync():
-    """ Synchronization """
-
-    if "resource" in request.get_vars:
-        tablename = request.get_vars["resource"]
-        if "_" in tablename:
-
-            # URL variables from peer
-            _vars = request.get_vars
-            get_vars=Storage(include_deleted=True)
-            if "repository" in _vars:
-                get_vars.update(repository=_vars["repository"])
-            if "msince" in _vars:
-                get_vars.update(msince=_vars["msince"])
-
-            # Request
-            prefix, name = tablename.split("_", 1)
-            r = s3mgr.parse_request(prefix=prefix,
-                                    name=name,
-                                    args=["sync"],
-                                    get_vars=get_vars)
-
-            # Response
-            output = r()
-            return output
-
-    raise HTTP(400, body=s3mgr.ERROR.BAD_REQUEST)
-
-# -----------------------------------------------------------------------------
-def log():
-    """ Log Reader """
-
-    resourcename = "log"
-
-    if "return" in request.get_vars:
-        there = request.get_vars["return"]
-        c, f = there.split(".", 1)
-        list_btn = URL(c=c, f=f,
-                       args="sync_log")
-    else:
-        list_btn = URL(c="sync", f="log",
-                       vars=request.get_vars)
-
-    list_btn = A(T("List all Entries"), _href=list_btn, _class="action-btn")
-
-    output = s3_rest_controller(prefix, resourcename,
-                                subtitle=None,
-                                rheader=s3base.S3SyncLog.rheader,
-                                list_btn=list_btn)
-    return output
-
-# END =========================================================================
+# -*- coding: utf-8 -*-
+
+"""
+    Synchronisation, Controllers
+
+    @author: Dominic König <dominic[at]aidiq[dot]com>
+"""
+
+module = request.controller
+prefix = "sync" # common table prefix
+module_name = T("Synchronization")
+
+# Options Menu (available in all Functions' Views)
+s3_menu(module)
+
+# -----------------------------------------------------------------------------
+def index():
+    """ Module's Home Page """
+
+    response.title = module_name
+    return dict(module_name=module_name)
+
+# -----------------------------------------------------------------------------
+def config():
+    """ Synchronization Settings Controller """
+
+    resourcename = "config"
+
+    # Get the record ID of the first and only record
+    s3mgr.load("sync_config")
+    table = db.sync_config
+    record = db().select(table.id, limitby=(0, 1)).first()
+    if not record:
+        record_id = table.insert()
+    else:
+        record_id = record.id
+
+    # Can't do anything else than update here
+    r = s3mgr.parse_request(args=[str(record_id), "update"],
+                            extension="html")
+
+    output = r(list_btn=None)
+    return output
+
+# -----------------------------------------------------------------------------
+def repository():
+    """ Repository Management Controller """
+
+    resourcename = "repository"
+
+    tabs = [(T("Configuration"), None),
+            (T("Resources"), "task"),
+            (T("Schedule"), "job"),
+            (T("Log"), "log"),
+            #(T("Conflicts"), "conflict")
+           ]
+
+    s3mgr.model.set_method("sync", "repository",
+                           method="register",
+                           action=s3mgr.sync)
+
+    def prep(r):
+        if r.interactive:
+            if r.component and r.id:
+                if r.component.alias == "job":
+                    current.s3task.configure_tasktable_crud(
+                        function="sync_synchronize",
+                        args = [r.id],
+                        vars = dict(user_id = auth.user.id))
+                response.s3.cancel = URL(c="sync", f="repository",
+                                         args=[str(r.id), r.component.alias])
+        return True
+    response.s3.prep = prep
+
+    def postp(r, output):
+        if r.interactive and r.id:
+            if r.component and r.component.alias == "job":
+                response.s3.actions = [
+                    dict(label=str(T("Reset")),
+                         _class="action-btn",
+                         url=URL(c="sync", f="repository",
+                                 args=[str(r.id), "job", "[id]", "reset"]))
+                    ]
+        s3_action_buttons(r)
+        return output
+    response.s3.postp = postp
+
+    rheader = lambda r: sync_rheader(r, tabs=tabs)
+    output = s3_rest_controller(prefix, resourcename, rheader=rheader)
+    return output
+
+# -----------------------------------------------------------------------------
+def sync():
+    """ Synchronization """
+
+    if "resource" in request.get_vars:
+        tablename = request.get_vars["resource"]
+        if "_" in tablename:
+
+            # URL variables from peer
+            _vars = request.get_vars
+            get_vars=Storage(include_deleted=True)
+            if "repository" in _vars:
+                get_vars.update(repository=_vars["repository"])
+            if "msince" in _vars:
+                get_vars.update(msince=_vars["msince"])
+
+            # Request
+            prefix, name = tablename.split("_", 1)
+            r = s3mgr.parse_request(prefix=prefix,
+                                    name=name,
+                                    args=["sync"],
+                                    get_vars=get_vars)
+
+            # Response
+            output = r()
+            return output
+
+    raise HTTP(400, body=s3mgr.ERROR.BAD_REQUEST)
+
+# -----------------------------------------------------------------------------
+def log():
+    """ Log Reader """
+
+    resourcename = "log"
+
+    if "return" in request.get_vars:
+        there = request.get_vars["return"]
+        c, f = there.split(".", 1)
+        list_btn = URL(c=c, f=f,
+                       args="sync_log")
+    else:
+        list_btn = URL(c="sync", f="log",
+                       vars=request.get_vars)
+
+    list_btn = A(T("List all Entries"), _href=list_btn, _class="action-btn")
+
+    output = s3_rest_controller(prefix, resourcename,
+                                subtitle=None,
+                                rheader=s3base.S3SyncLog.rheader,
+                                list_btn=list_btn)
+    return output
+
+# END =========================================================================