From 638b287d1bf9e2772716cc6391a18d65ade3e18b Mon Sep 17 00:00:00 2001 From: Sean O'Brien Date: Mon, 27 Feb 2012 17:18:41 -0500 Subject: new template based upon bootstrap --- modules/installed/apps/apps.py | 4 ++-- modules/installed/help/help.py | 18 ++++++++++-------- modules/installed/lib/forms.py | 10 +++++----- modules/installed/privacy/privacy.py | 6 +++--- modules/installed/router/info.py | 2 +- modules/installed/router/router.py | 10 +++++----- modules/installed/services/services.py | 4 ++-- modules/installed/sharing/sharing.py | 6 +++--- modules/installed/system/config.py | 2 +- modules/installed/system/expert_mode.py | 2 +- modules/installed/system/system.py | 4 ++-- modules/installed/system/users.py | 14 +++++++------- modules/installed/system/wan.py | 4 ++-- 13 files changed, 44 insertions(+), 42 deletions(-) (limited to 'modules') diff --git a/modules/installed/apps/apps.py b/modules/installed/apps/apps.py index 1de7617..fa22178 100644 --- a/modules/installed/apps/apps.py +++ b/modules/installed/apps/apps.py @@ -7,7 +7,7 @@ class Apps(PagePlugin): def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) self.register_page("apps") - self.menu = cfg.main_menu.add_item("User Apps", "/apps", 80) + self.menu = cfg.main_menu.add_item("Apps", "/apps", 80) self.menu.add_item("Photo Gallery", "/apps/photos", 35) @cherrypy.expose @@ -27,7 +27,7 @@ class Apps(PagePlugin): @require() def photos(self): return self.fill_template(title="Open ID", main='', sidebar_right=""" -

Photo Gallery

Your photos might well be the most valuable +Photo Gallery

Your photos might well be the most valuable digital property you have, so why trust it to companies that have no investment in the sentimental value of your family snaps? Keep those photos local, backed up, easily accessed and free from the whims of diff --git a/modules/installed/help/help.py b/modules/installed/help/help.py index e0a1870..f10b04d 100644 --- a/modules/installed/help/help.py +++ b/modules/installed/help/help.py @@ -8,7 +8,7 @@ class Help(PagePlugin): def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) self.register_page("help") - self.menu = cfg.main_menu.add_item(_("Documentation and FAQ"), "/help", 101) + self.menu = cfg.main_menu.add_item(_("Documentation"), "/help", 101) self.menu.add_item(_("Where to Get Help"), "/help/index", 5) self.menu.add_item(_("Developer's Manual"), "/help/view/plinth", 10) self.menu.add_item(_("FAQ"), "/help/view/faq", 20) @@ -27,7 +27,7 @@ class Help(PagePlugin): offer suggestions, edits, and screenshots for completing it!

-

A section of +

A section of the Debian wiki is devoted to the %(box)s. At some point the documentation in the wiki and the documentation in the manual should dovetail.

@@ -48,8 +48,9 @@ class Help(PagePlugin): @cherrypy.expose def about(self): return self.fill_template(title=_("About the %s" % cfg.box_name), main=""" -

We live in a world where our use of the network is - mediated by organizations that often do not have our best + +

We live in a world where our use of the network is + mediated by those who often do not have our best interests at heart. By building software that does not rely on a central service, we can regain control and privacy. By keeping our data in our homes, we gain useful legal @@ -62,14 +63,15 @@ class Help(PagePlugin): runs on must be cheap. The software it runs on must be easy to install and administrate by anybody. It must be easy to transition from existing services.

- -

There are a number of projects working to realize a future +

Learn more »

""", + sidebar_right=_("""Our Goal

There are a number of projects working to realize a future of distributed services; we aim to bring them all together in a convenient package.

-

For more information about the Freedom Box project, see the +

For more information about the FreedomBox project, see the Debian - Wiki.

""") + Wiki.

+ """)) class View(PagePlugin): def __init__(self, *args, **kwargs): diff --git a/modules/installed/lib/forms.py b/modules/installed/lib/forms.py index aac4cd4..df78eea 100644 --- a/modules/installed/lib/forms.py +++ b/modules/installed/lib/forms.py @@ -50,9 +50,9 @@ class Form(): quad = [0,0,0,0] self.text += """ """ % {'label':label, 'name':name, 'id':id, 'q0':quad[0], 'q1':quad[1], 'q2':quad[2], 'q3':quad[3]} @@ -77,7 +77,7 @@ class Form(): self.text += """
\n""" % (label, name, id) def submit_row(self, buttons): """buttons is a list of tuples, each containing label, name, id. Name and id are optional.""" @@ -99,7 +99,7 @@ class Form(): if button_text != '': button_text += " " - button_text += '\n' % (label, name, id) + button_text += '\n' % (label, name, id) self.text += '%s' % button_text def name_or_id(self, name, id): if not name: name = id diff --git a/modules/installed/privacy/privacy.py b/modules/installed/privacy/privacy.py index 8eee565..a0eeffa 100644 --- a/modules/installed/privacy/privacy.py +++ b/modules/installed/privacy/privacy.py @@ -9,7 +9,7 @@ class Privacy(PagePlugin): def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) self.register_page("privacy") - self.menu = cfg.main_menu.add_item("Privacy Controls", "/privacy", 12) + self.menu = cfg.main_menu.add_item("Privacy", "/privacy", 12) self.menu.add_item("General Config", "/privacy/config", 10) self.menu.add_item("Ad Blocking", "/privacy/adblock", 20) self.menu.add_item("TOR", "/privacy/TOR", 30) @@ -29,7 +29,7 @@ class Privacy(PagePlugin): is a founding consideration, not an afterthought.

""" return self.fill_template(title=_("Privacy Control Panel"), main=main, -sidebar_right=_("""

Statement of Principles

When we say your +sidebar_right=_("""Statement of Principles

When we say your privacy is important, it's not just an empty pleasantry. We really mean it. Your privacy control panel should give you fine-grained control over exactly who can access your %s and the @@ -37,6 +37,6 @@ information on it.

Your personal information should not leave this box without your knowledge and direction. And if companies or government wants this -information, they have to ask you for it. This gives you a +information, they have to ask you for it. This gives you a change to refuse and also tells you who wants your data.

""") % cfg.product_name) diff --git a/modules/installed/router/info.py b/modules/installed/router/info.py index 1f4585a..9b1f6ff 100644 --- a/modules/installed/router/info.py +++ b/modules/installed/router/info.py @@ -14,5 +14,5 @@ class Info(PagePlugin): @require() def index(self): return self.fill_template(title="Router Information", main=""" -

Eventually we will display a bunch of info, graphs and logs about the routing functions here.

+

Eventually we will display a bunch of info, graphs and logs about the routing functions here.

""") diff --git a/modules/installed/router/router.py b/modules/installed/router/router.py index 0d12c87..91b5866 100644 --- a/modules/installed/router/router.py +++ b/modules/installed/router/router.py @@ -11,7 +11,7 @@ class router(PagePlugin): order = 9 # order of running init in PagePlugins def __init__(self, *args, **kwargs): self.register_page("router") - self.menu = cfg.main_menu.add_item("Router Admin", "/router", 10) + self.menu = cfg.main_menu.add_item("Router", "/router", 10) self.menu.add_item("Wireless", "/router/wireless", 12) self.menu.add_item("Firewall", "/router/firewall", 18) self.menu.add_item("Hotspot and Mesh", "/router/hotspot") @@ -54,7 +54,7 @@ class setup(PagePlugin): def index(self): parts = self.forms('/router/setup') parts['title'] = "General Router Setup" - parts['sidebar_right']="""

Introduction

Your %s is a replacement for your + parts['sidebar_right']="""Introduction

Your %s is a replacement for your wireless router. By default, it should do everything your usual router does. With the addition of some extra modules, its abilities can rival those of high-end routers costing hundreds of dollars.

@@ -88,7 +88,7 @@ class wan(FormPlugin, PagePlugin): url = ["/router/setup"] order = 10 - js = """