diff --git a/.gitignore b/.gitignore index 5bce3ed73..a30ed9e0c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ doc/TODO.mdwn doc/oneline.txt doc/plinth.1 plinth.config -templates/*.py TODO \#* .#* diff --git a/INSTALL b/INSTALL index a8d6138d6..a32ae8fb8 100644 --- a/INSTALL +++ b/INSTALL @@ -2,10 +2,9 @@ ## Installing Plinth -Install the python-cheetah package, pandoc, python-augeas, and -bjsonrpc: +Install the dependencies: -apt-get install python-cheetah pandoc python-augeas python-bjsonrpc python-cherrypy3 python-simplejson +apt-get install pandoc psmisc python2.7 python-bcrypt python-cherrypy3 python-django python-passlib python-bootstrapform libjs-twitter-bootstrap sudo Unzip and untar the source into a directory. Change to the directory containing the program. Run: @@ -23,15 +22,13 @@ and the default password is "secret". * cherrypy - python web engine v3+ -* cheetah - Debian has python-cheetah package - * python - tested with version 2.6.6 * *GNU Make* is used to build the templates and such. -* bjsonrpc - used for configuration management layer +* *libjs-twitter-bootstrap* - A responsive, mobile first front-end framework -* python-augeas and augeas - used for configuration management +* *python-bootstrapform* - Render django forms for Twitter Bootstrap The documentation has some dependencies too. diff --git a/LICENSES b/LICENSES index 74ccf00e7..ab1641ef1 100644 --- a/LICENSES +++ b/LICENSES @@ -73,12 +73,10 @@ specified and linked otherwise. - share/apache2/plinth-ssl.conf :: - - share/init.d/plinth :: - - sudoers/plinth :: - -- templates/base.tmpl :: [[file:templates/base.tmpl::the%20GNU%20Affero%20General%20Public][GNU Affero General Public License, Version 3 or later]] -- templates/err.tmpl :: - -- templates/__init__.py :: - -- templates/login_nav.tmpl :: - -- templates/Makefile :: - -- templates/two_col.tmpl :: - +- templates/base.html:: [[file:templates/base.tmpl::the%20GNU%20Affero%20General%20Public][GNU Affero General Public License, Version 3 or later]] +- templates/err.html:: - +- templates/login_nav.html:: - +- templates/two_col.html:: - - tests/actions_test.py :: - - tests/auth_test.py :: - - tests/testdata/users.sqlite3 :: - @@ -87,8 +85,6 @@ specified and linked otherwise. - themes/default/FreedomBox-Logo.7z :: [[http://thread.gmane.org/gmane.linux.debian.freedombox.user/4124/focus=4439][GPL3+/CC-BY-SA]] - themes/default/readme.md :: [[file:themes/default/readme.md::This%20theme%20is%20free%20software%20offered%20to%20you%20under%20the%20terms%20of%20the%20GNU%20Affero%20General%20Public%20License,%20Version%203%20or%20later:][GNU Affero General Public License Version 3]] - themes/default/screenshot.png :: - -- themes/default/css/bootstrap.css :: [[file:themes/default/css/bootstrap.css::*%20Licensed%20under%20the%20Apache%20License%20v2.0][Apache License v2.0]] -- themes/default/css/bootstrap-responsive.css :: [[file:themes/default/css/bootstrap-responsive.css::*%20Licensed%20under%20the%20Apache%20License%20v2.0][Apache License v2.0]] - themes/default/img/apple-touch-icon-114px-precomposed.png :: - - themes/default/img/apple-touch-icon-57px-precomposed.png :: - - themes/default/img/apple-touch-icon-72px-precomposed.png :: - @@ -111,23 +107,5 @@ specified and linked otherwise. - themes/default/img/freedombox-logotype.png :: - - themes/default/img/glyphicons-halflings.png :: - - themes/default/img/glyphicons-halflings-white.png :: - -- themes/default/js/functions.js :: - -- themes/default/js/menu.js :: - -- themes/default/js/plinth.js :: - -- themes/default/js/plugins.js :: [[file:themes/default/js/plugins.js::/%20paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/][CC0]] - themes/default/js/libs/jquery.min.js :: Symlink to external target: [[file:themes/default/js/libs/jquery.min.js::*%20Dual%20licensed%20under%20the%20MIT%20or%20GPL%20Version%202%20licenses.][MIT/GPL2]] - themes/default/js/libs/modernizr.min.js :: Symlink to external target: MIT -- themes/default/js/libs/bootstrap/alert.js :: [[file:themes/default/js/libs/bootstrap/alert.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/bootstrap.js :: [[file:themes/default/js/libs/bootstrap/bootstrap.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/bootstrap.min.js :: - -- themes/default/js/libs/bootstrap/button.js :: [[file:themes/default/js/libs/bootstrap/button.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/carousel.js :: [[file:themes/default/js/libs/bootstrap/carousel.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/collapse.js :: [[file:themes/default/js/libs/bootstrap/collapse.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/dropdown.js :: [[file:themes/default/js/libs/bootstrap/dropdown.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/modal.js :: [[file:themes/default/js/libs/bootstrap/modal.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/popover.js :: [[file:themes/default/js/libs/bootstrap/popover.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/scrollspy.js :: [[file:themes/default/js/libs/bootstrap/scrollspy.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/tab.js :: [[file:themes/default/js/libs/bootstrap/tab.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/tooltip.js :: [[file:themes/default/js/libs/bootstrap/tooltip.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/transition.js :: [[file:themes/default/js/libs/bootstrap/transition.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] -- themes/default/js/libs/bootstrap/typeahead.js :: [[file:themes/default/js/libs/bootstrap/typeahead.js::*%20Licensed%20under%20the%20Apache%20License,%20Version%202.0%20(the%20"License")%3B][Apache License v2.0]] diff --git a/Makefile b/Makefile index 44e4356df..bf6f8c021 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,5 @@ MAKE=make -CSS=$(wildcard *.css) -CSS=$(subst .tiny,,$(shell find themes -type f -name '*.css')) -COMPRESSED_CSS := $(patsubst %.css,%.tiny.css,$(CSS)) PWD=`pwd` # hosting variables @@ -13,11 +10,11 @@ DATADIR=/usr/share/plinth PYDIR=$(DATADIR)/python/plinth ## Catch-all targets -default: config dirs template css docs +default: config dirs docs all: default predepend: - sudo sh -c "apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cheetah python-cherrypy3 python-django python-passlib python-simplejson sudo" + sudo sh -c "apt-get install pandoc psmisc python2.7 python-bcrypt python-cherrypy3 python-django python-passlib python-bootstrapform libjs-twitter-bootstrap sudo" git submodule init git submodule update touch predepend @@ -54,14 +51,6 @@ dirs: config: Makefile @test -f plinth.config || cp plinth.sample.config plinth.config -%.tiny.css: %.css - @cat $< | python -c 'import re,sys;print re.sub("\s*([{};,:])\s*", "\\1", re.sub("/\*.*?\*/", "", re.sub("\s+", " ", sys.stdin.read())))' > $@ -css: $(COMPRESSED_CSS) - -template: - @$(MAKE) -s -C templates -templates: template - docs: @$(MAKE) -s -C doc doc: docs @@ -71,14 +60,12 @@ html: clean: @rm -f cherrypy.config data/cherrypy_sessions/* - @find themes -name "*.tiny.css" -exec rm {} \; @find . -name "*~" -exec rm {} \; @find . -name ".#*" -exec rm {} \; @find . -name "#*" -exec rm {} \; @find . -name "*.pyc" -exec rm {} \; @find . -name "*.bak" -exec rm {} \; @$(MAKE) -s -C doc clean - @$(MAKE) -s -C templates clean rm -f plinth.config rm -f predepend diff --git a/doc/Makefile b/doc/Makefile index adaf5e2f1..c45bdbc99 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -41,7 +41,7 @@ $(SOURCES): @rm -f $@ @ln -s ../$(patsubst %.mdwn,%,$@) $@ -../TODO : $(TODO_SOURCES) ../*.py ../modules/*.py ../Makefile Makefile ../templates/Makefile +../TODO : $(TODO_SOURCES) ../*.py ../modules/*.py ../Makefile Makefile grep -ro --exclude=.git* --exclude=plinth.1 --exclude=*.tex --exclude=*.html \ --exclude=README.mdwn --exclude=INSTALL.mdwn \ --exclude=TODO.mdwn --exclude=COPYING.mdwn \ diff --git a/doc/modules.mdwn b/doc/modules.mdwn index 6d8851a4c..6726dcd23 100644 --- a/doc/modules.mdwn +++ b/doc/modules.mdwn @@ -51,15 +51,6 @@ metaclasses can be created to make new classes of plugins. Any place that might be affected by arbitrary addition of modules should have its own metaclass. -### FromPlugin - -Each form displayed in the interface should inherit from FormPlugin. -This will allow the system to display multiple forms on the page in -the correct order. Forms will likely also want to inherit from -PagePlugin because after the user clicks submit, the plugin usually -displays a responsive message or an error (along with the form to fill -out again). - ## Coding Practices for Modules All the diff --git a/doc/style.css b/doc/style.css index 1d1829961..499266614 120000 --- a/doc/style.css +++ b/doc/style.css @@ -1 +1 @@ -../static/theme/style.css \ No newline at end of file +../static/theme/css/bootstrap.min.css \ No newline at end of file diff --git a/doc/themes.mdwn b/doc/themes.mdwn index 3546182a9..9d95cbc73 100644 --- a/doc/themes.mdwn +++ b/doc/themes.mdwn @@ -1,8 +1,9 @@ # Themes and Templates The visual look and feel of the front end is described in theme files -while Cheetah templates -handle layout. +while Django +templates handle layout. ## Themes @@ -17,43 +18,35 @@ runtime, but it is theoretically possible. ## Templates -Plinth uses the Cheetah templating system. Templates are stored in +Plinth uses the Django templating system. Templates are stored in `/templates`. Template requirements are not specified. -TODO: formalize the template spec so template writers know what they need to implement and where they can deviate. +TODO: formalize the template spec so template writers know what they +need to implement and where they can deviate. In this section, I'll attempt to document some of the assumptions the program has about templates. The goal is that if you write a tempate that implements the spec, it should work just fine. ### The Template Stack + The template is a hierarchical stack, where some templates extend on others. At the base of this stack is `base.tmpl`. It should specify -variables as blocks (rather than using the $ notation). This allows +sections as blocks (rather than using the variables). This allows other templates to easily override the base template. -Next up is the `page.tmpl`. It extends `base.tmpl` and simply -replaces all the blocks with interpolable variables. Most of the -time, `page.tmpl` is what you will actually use to create pages. - `err.tmpl` builds on top of `page.tmpl` by adding some decoration to the title field. ### Layout -Plinth expects a `main` block. This is where the -meat of the content goes. It is the center pain in the default -layout. There is a `title` block that the program will fill with text -describing the current page. `sidebar_left` contains the submenu -navigation menu, and `sidebar_right` is where we put all short text -that helps the admin fill out forms. They don't have to be sidebars, -and they don't have to go on the left and right. +Plinth expects a `main` block. This is where the meat of the content +goes. It is the center pain in the default layout. There is a +`title` block that the program will fill with text describing the +current page. `sidebar_left` contains the submenu navigation menu, +and `sidebar_right` is where we put all short text that helps the +admin fill out forms. They don't have to be sidebars, and they don't +have to go on the left and right. It is possible to override the `footer`, but I haven't yet found a reason to do so. - -## Cheetah - -This section is for Cheetah hints that are especially useful in this context. - -TODO: add Cheetah hints diff --git a/fabfile.py b/fabfile.py index 7801834aa..c8bde9722 100644 --- a/fabfile.py +++ b/fabfile.py @@ -7,10 +7,7 @@ # plinth box import os,sys, subprocess -try: - import simplejson as json -except ImportError: - import json +import json import fabric.api from fabric.api import local, env, cd, put, get, task @@ -150,7 +147,7 @@ def apache(): @task def deps(): "Basic plinth dependencies" - sudo('apt-get install --no-install-recommends -y python make python-cheetah pandoc python-simplejson python-pyme python-augeas python-bjsonrpc') + sudo('apt-get install --no-install-recommends -y python make pandoc python-pyme python-django python-bootstrapform libjs-twitter-bootstrap') @task def update(): diff --git a/filedict.py b/filedict.py index d4f9a35ad..94f779759 100644 --- a/filedict.py +++ b/filedict.py @@ -5,13 +5,9 @@ Author: Erez Shinan Date : 31-May-2009 """ -try: - import simplejson as json ## jlv replaced pickle with json -except ImportError: - import json +import json import UserDict -##import cPickle as pickle import sqlite3 diff --git a/menu.py b/menu.py index 93860dcdb..84b26c19d 100644 --- a/menu.py +++ b/menu.py @@ -1,19 +1,16 @@ from urlparse import urlparse -try: - import simplejson as json -except ImportError: - import json import cherrypy import cfg + class Menu(): """One menu item.""" def __init__(self, label="", icon="", url="#", order=50): """label is the text that is displayed on the menu. - icon is the icon to be displayed next to the label. - Choose from the Glyphicon set: - http://twitter.github.com/bootstrap/base-css.html#icons + icon is the icon to be displayed next to the label. + Choose from the Glyphicon set: + http://twitter.github.com/bootstrap/base-css.html#icons url is the url location that will be activated when the menu item is selected. @@ -35,11 +32,13 @@ class Menu(): def sort_items(self): """Sort the items in self.items by order.""" self.items = sorted(self.items, key=lambda x: x.order, reverse=False) + def add_item(self, label, icon, url, order=50, basehref=True): """This method creates a menu item with the parameters, adds that menu item to this menu, and returns the item. - If BASEHREF is true and url start with a slash, prepend the cfg.server_dir to it""" + If BASEHREF is true and url start with a slash, prepend the + cfg.server_dir to it""" if basehref and url.startswith("/"): url = cfg.server_dir + url @@ -62,27 +61,3 @@ class Menu(): for item in self.items: if path.startswith(item.url): return item - - def serializable(self, render_subs=False): - """Return the items in self.items as a serializable object we can pass to json. - Note: this doesn't serialize all the data in this object.""" - - so = [] - for item in self.items: - i = { 'label':item.label, 'icon':item.icon, 'url':item.url} - if item.active_p(): - i['active']=True - if item.items and render_subs: - i['subs'] = item.serializable() - so.append(i) - return so - def encode(self, name="", render_subs=False): - """return a string containing a javascript data structure - assigned to the menu name - - if render_subs is True, we render submenus too""" - - return ('') diff --git a/modules/installed/apps/apps.py b/modules/installed/apps/apps.py index e463cd634..43f8fcafd 100644 --- a/modules/installed/apps/apps.py +++ b/modules/installed/apps/apps.py @@ -2,37 +2,25 @@ import cherrypy from gettext import gettext as _ from modules.auth import require from plugin_mount import PagePlugin -from forms import Form import cfg +import util + class Apps(PagePlugin): def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) self.register_page("apps") self.menu = cfg.main_menu.add_item("Apps", "icon-download-alt", "/apps", 80) - self.menu.add_item("Chat", "icon-comment", "http://freedombox.local", 30) + self.menu.add_item("Chat", "icon-comment", "/../jwchat", 30) self.menu.add_item("Photo Gallery", "icon-picture", "/apps/photos", 35) @cherrypy.expose def index(self): - main = """ -

User Applications are web apps hosted on your %s.

- -

Eventually this box could be your photo sharing site, your - instant messaging site, your social networking site, your news - site. Remember web portals? We can be one of those too. - Many of the services you use on the web could soon be on site - and under your control!

- """ % (cfg.product_name) - return self.fill_template(title="User Applications", main=main, sidebar_right='') + return util.render_template(template='apps', + title=_('User Applications')) @cherrypy.expose @require() def photos(self): - return self.fill_template(title="Photo Gallery", main='', sidebar_right=""" -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 -some other websites business model.

-""") + return util.render_template(template='photos', + title=_('Photo Gallery')) diff --git a/modules/installed/apps/owncloud.py b/modules/installed/apps/owncloud.py index 6fc1d6622..7ed4dfcdb 100644 --- a/modules/installed/apps/owncloud.py +++ b/modules/installed/apps/owncloud.py @@ -1,82 +1,85 @@ import cherrypy +from django import forms from gettext import gettext as _ from modules.auth import require -from plugin_mount import PagePlugin, FormPlugin -from forms import Form +from plugin_mount import PagePlugin import actions import cfg import service -from util import Message +import util -class Owncloud(PagePlugin, FormPlugin): + +class OwnCloudForm(forms.Form): # pylint: disable-msg=W0232 + """ownCloud configuration form""" + enabled = forms.BooleanField(label=_('Enable ownCloud'), required=False) + + # XXX: Only present due to issue with submitting empty form + dummy = forms.CharField(label='Dummy', initial='dummy', + widget=forms.HiddenInput()) + + +class OwnCloud(PagePlugin): + """ownCloud configuration page""" order = 90 def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) - self.register_page("apps.owncloud") - cfg.html_root.apps.menu.add_item("Owncloud", "icon-picture", "/apps/owncloud", 35) + self.register_page('apps.owncloud') + cfg.html_root.apps.menu.add_item('Owncloud', 'icon-picture', + '/apps/owncloud', 35) + + status = self.get_status() self.service = service.Service('owncloud', _('ownCloud'), ['http', 'https'], is_external=True, - enabled=self.is_enabled) - - def is_enabled(self): - """Return whether ownCloud is enabled""" - output, error = actions.run('owncloud-setup', 'status') - if error: - raise Exception('Error getting ownCloud status: %s' % error) - - return 'enable' in output.split() + enabled=status['enabled']) @cherrypy.expose @require() def index(self, **kwargs): - owncloud_enable = self.is_enabled() + """Serve the ownCloud configuration page""" + status = self.get_status() - if 'submitted' in kwargs: - owncloud_enable = self.process_form(kwargs) - - main = self.form(owncloud_enable) - sidebar_right=""" -ownCloud
-

ownCloud gives you universal access to your files through a web interface or WebDAV. It also provides a platform to easily view & sync your contacts, calendars and bookmarks across all your devices and enables basic editing right on the web. Installation has minimal server requirements, doesn't need special permissions and is quick. ownCloud is extendable via a simple but powerful API for applications and plugins. -

-""" - return self.fill_template(title="Owncloud", main=main, sidebar_right=sidebar_right) + form = None + messages = [] - def form(self, owncloud_enable, message=None): - form = Form(title="Configuration", - action=cfg.server_dir + "/apps/owncloud/index", - name="configure_owncloud", - message=message) - form.checkbox(_("Enable Owncloud"), name="owncloud_enable", id="owncloud_enable", checked=owncloud_enable) - # hidden field is needed because checkbox doesn't post if not checked - form.hidden(name="submitted", value="True") - form.html(_("""

When enabled, the owncloud installation will be available from owncloud on the web server. Visit this URL to set up the initial administration account for owncloud.

""")) - form.html(_("""

Note: Setting up owncloud for the first time might take 5 minutes or more, depending on download bandwidth from the Debian APT sources.

""")) - form.submit(_("Update setup")) - return form.render() + if kwargs: + form = OwnCloudForm(kwargs, prefix='owncloud') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(status, form.cleaned_data, messages) + status = self.get_status() + form = OwnCloudForm(initial=status, prefix='owncloud') + else: + form = OwnCloudForm(initial=status, prefix='owncloud') - def process_form(self, kwargs): - checkedinfo = { - 'enable' : False, - } + return util.render_template(template='owncloud', title=_('ownCloud'), + form=form, messages=messages) - opts = [] - for k in kwargs.keys(): - if 'on' == kwargs[k]: - shortk = k.split("owncloud_").pop() - checkedinfo[shortk] = True + @staticmethod + def get_status(): + """Return the current status""" + output, error = actions.run('owncloud-setup', 'status') + if error: + raise Exception('Error getting ownCloud status: %s' % error) - for key in checkedinfo.keys(): - if checkedinfo[key]: - opts.append(key) - else: - opts.append('no'+key) - actions.superuser_run("owncloud-setup", opts, async=True) + return {'enabled': 'enable' in output.split()} + + def _apply_changes(self, old_status, new_status, messages): + """Apply the changes""" + if old_status['enabled'] == new_status['enabled']: + messages.append(('info', _('Setting unchanged'))) + return + + if new_status['enabled']: + messages.append(('success', _('ownCloud enabled'))) + option = 'enable' + else: + messages.append(('success', _('ownCloud disabled'))) + option = 'noenable' + + actions.superuser_run('owncloud-setup', [option], async=True) # Send a signal to other modules that the service is # enabled/disabled - self.service.notify_enabled(self, checkedinfo['enable']) - - return checkedinfo['enable'] + self.service.notify_enabled(self, new_status['enabled']) diff --git a/modules/installed/apps/templates/apps.html b/modules/installed/apps/templates/apps.html new file mode 100644 index 000000000..a05062282 --- /dev/null +++ b/modules/installed/apps/templates/apps.html @@ -0,0 +1,31 @@ +{% extends 'login_nav.html' %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

User Applications are web apps hosted on your +{{ cfg.product_name }}.

+ +

Eventually this box could be your photo sharing site, your instant +messaging site, your social networking site, your news site. Remember +web portals? We can be one of those too. Many of the services you +use on the web could soon be on site and under your control!

+ +{% endblock %} diff --git a/modules/installed/apps/templates/owncloud.html b/modules/installed/apps/templates/owncloud.html new file mode 100644 index 000000000..1e7efebd0 --- /dev/null +++ b/modules/installed/apps/templates/owncloud.html @@ -0,0 +1,63 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + + {% include 'messages.html' %} + +
+ {% csrf_token %} + + {{ form|bootstrap }} + +

When enabled, the owncloud installation will be available + from owncloud on the web server. Visit + this URL to set up the initial administration account for + owncloud.

+ +

Note: Setting up owncloud for the first time might take + 5 minutes or more, depending on download bandwidth from the + Debian APT sources.

+ + + +
+ +{% endblock %} + +{% block sidebar_right_block %} + +
+ +

ownCloud

+ +

ownCloud gives you universal access to your files through a web + interface or WebDAV. It also provides a platform to easily view + & sync your contacts, calendars and bookmarks across all your + devices and enables basic editing right on the web. Installation + has minimal server requirements, doesn't need special + permissions and is quick. ownCloud is extendable via a simple + but powerful API for applications and plugins.

+ +
+ +{% endblock %} diff --git a/modules/installed/apps/templates/photos.html b/modules/installed/apps/templates/photos.html new file mode 100644 index 000000000..5658a54ff --- /dev/null +++ b/modules/installed/apps/templates/photos.html @@ -0,0 +1,29 @@ +{% extends 'login_nav.html' %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

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 some other +websites business model.

+ +{% endblock %} diff --git a/modules/installed/first_boot.py b/modules/installed/first_boot.py index 47315f9a7..8fdde7b31 100644 --- a/modules/installed/first_boot.py +++ b/modules/installed/first_boot.py @@ -1,16 +1,5 @@ -from urlparse import urlparse -import os, cherrypy, re -from gettext import gettext as _ -from plugin_mount import PagePlugin, PluginMount, FormPlugin -from modules.auth import require, add_user -from forms import Form -import util as u -from withsqlite.withsqlite import sqlite_db -import cfg -import config -from model import User - -"""First Boot: Initial Plinth Configuration. +""" +First Boot: Initial Plinth Configuration. See docs/design/first-connection.mdwn for details. @@ -27,27 +16,76 @@ The Plinth first-connection process has several stages: 3. The box detects the network's configuration and restarts networking. 4. The user interacts with the box normally. - """ +import cherrypy +from django import forms +from django.core import validators +from gettext import gettext as _ +from plugin_mount import PagePlugin +from modules.auth import add_user +from withsqlite.withsqlite import sqlite_db +import cfg +import config +import util + + +## TODO: flesh out these tests values +def valid_box_key(value): + """Check whether box key is valid""" + del value # Unused + + return True + + +class State0Form(forms.Form): # pylint: disable-msg=W0232 + """First boot state 0 form""" + + hostname = forms.CharField( + label=_('Name your FreedomBox'), + help_text=_('For convenience, your FreedomBox needs a name. It \ +should be something short that does not contain spaces or punctuation. \ +"Willard" would be a good name while "Freestyle McFreedomBox!!!" would \ +not. It must be alphanumeric, start with an alphabet and must not be greater \ +than 63 characters in length.'), + validators=[ + validators.RegexValidator(r'^[a-zA-Z][a-zA-Z0-9]{,62}$', + _('Invalid hostname'))]) + + username = forms.CharField(label=_('Username')) + password = forms.CharField(label=_('Password'), + widget=forms.PasswordInput()) + + box_key = forms.CharField( + label=_('Box\'s key (optional)'), required=False, + widget=forms.Textarea(), validators=[valid_box_key], + help_text=_('Cryptographic keys are used so that Box\'s identity can \ +proved when talking to you. This key can be auto-generated, but if one \ +already exists (from a prior FreedomBox, for example), you can paste it \ +below. This key should not be the same as your key because you are not your \ +FreedomBox!')) + class FirstBoot(PagePlugin): + """First boot wizard""" + def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) - self.register_page("firstboot") # this is the url this page will hang off of (/firstboot) + + # this is the url this page will hang off of (/firstboot) + self.register_page('firstboot') + self.register_page('firstboot/state0') + self.register_page('firstboot/state1') @cherrypy.expose def index(self, *args, **kwargs): return self.state0(*args, **kwargs) - ## TODO: flesh out these tests values - def valid_box_key_p(self, key): - return True def generate_box_key(self): return "fake key" @cherrypy.expose - def state0(self, message="", hostname="", box_key="", submitted=False, username="", password="", **kwargs): + def state0(self, **kwargs): """ In this state, we do time config over HTTP, name the box and server key selection. @@ -64,68 +102,70 @@ class FirstBoot(PagePlugin): """ # FIXME: reject connection attempt if db["state"] >= 5. + ## Until LDAP is in place, we'll put the box key in the cfg.store_file + status = self.get_state0() - ## Until LDAP is in place, we'll put the box name and key in the cfg.store_file - ## Must resist the sick temptation to write an LDAP interface to the sqlite file - with sqlite_db(cfg.store_file, table="thisbox", autocommit=True) as db: - db['about'] = "This table is for information about this FreedomBox" - if hostname: - if '' == config.valid_hostname(hostname): - config.set_hostname(hostname) - else: - message += _("Invalid box name: %s") % config.valid_hostname(hostname) + form = None + messages = [] + + if kwargs: + form = State0Form(kwargs, prefix='firstboot') + # pylint: disable-msg=E1101 + if form.is_valid(): + success = self._apply_state0(status, form.cleaned_data, + messages) + + if success: + # Everything is good, permanently mark and move to page 2 + with sqlite_db(cfg.store_file, table="firstboot", + autocommit=True) as database: + database['state'] = 1 + + raise cherrypy.InternalRedirect('state1') + else: + form = State0Form(initial=status, prefix='firstboot') + + return util.render_template(template='firstboot_state0', + title=_('First Boot!'), form=form, + messages=messages) + + @staticmethod + def get_state0(): + """Return the state for form state 0""" + with sqlite_db(cfg.store_file, table="thisbox", autocommit=True) as \ + database: + return {'hostname': config.get_hostname(), + 'box_key': database.get('box_key', None)} + + def _apply_state0(self, old_state, new_state, messages): + """Apply changes in state 0 form""" + success = True + with sqlite_db(cfg.store_file, table="thisbox", autocommit=True) as \ + database: + database['about'] = 'Information about this FreedomBox' + + if new_state['box_key']: + database['box_key'] = new_state['box_key'] + elif not old_state['box_key']: + database['box_key'] = self.generate_box_key() + + if old_state['hostname'] != new_state['hostname']: + config.set_hostname(new_state['hostname']) + + error = add_user(new_state['username'], new_state['password'], + 'First user, please change', '', True) + if error: + messages.append( + ('error', _('User account creation failed: %s') % error)) + success = False else: - hostname = config.get_hostname() - if box_key: - if self.valid_box_key_p(box_key): - db['box_key'] = box_key - else: - message += _("Invalid key!") - elif 'box_key' in db and db['box_key']: - box_key = _("We already have a key for this box on file.") # TODO: Think this through and handle more gracefully. Seriously. - elif submitted and not box_key: - box_key = self.generate_box_key() - db['box_key'] = box_key - if username and password: - error = add_user(username, password, 'First user - please change', '', True) - if error: - message += _("User account creation failed: %s") % error - validuser = False - else: - validuser = True - else: - validuser = False + messages.append(('success', _('User account created'))) - if hostname and box_key and '' == config.valid_hostname(hostname) and self.valid_box_key_p(box_key) and validuser: - ## Update state to 1 and head there - with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db: - db['state']=1 - raise cherrypy.InternalRedirect('state1') - - main = "

Welcome. It looks like this FreedomBox isn't set up yet. We'll need to ask you a just few questions to get started.

" - form = Form(title="Welcome to Your FreedomBox!", - action="", # stay at firstboot - name="whats_my_name", - message=message) - form.html("

For convenience, your FreedomBox needs a name. It should be something short that doesn't contain spaces or punctuation. 'Willard' would be a good name. 'Freestyle McFreedomBox!!!' would not.

") - form.text_input('Name your FreedomBox', id="hostname", value=hostname) - form.html("

Initial user and password. Access to this web interface is protected by knowing a username and password. Provide one here to register the initial privileged user. The password can be changed and other users added later.

") - form.text_input('Username:', id="username", value=username) - form.text_input('Password:', id="password", type='password') - form.html("

%(box_name)s uses cryptographic keys so it can prove its identity when talking to you. %(box_name)s can make a key for itself, but if one already exists (from a prior FreedomBox, for example), you can paste it below. This key should not be the same as your key because you are not your FreedomBox!

" % {'box_name':cfg.box_name}) - form.text_box("If you want, paste your box's key here.", id="box_key", value=box_key) - form.hidden(name="submitted", value="True") - form.submit("Box it up!") - - main += form.render() - return self.fill_template( - template="base", - title=_("First Boot!"), - main=main, - sidebar_right=sidebar_right) + return success + @staticmethod @cherrypy.expose - def state1(self, message=None): + def state1(): """ State 1 is when we have a box name and key. In this state, our task is to provide a certificate and maybe to guide the @@ -134,31 +174,11 @@ class FirstBoot(PagePlugin): TODO: HTTPS failure in State 2 should returns to state 1. """ - main = """ -

Welcome screen not completely implemented yet. Press continue to see the rest of the web interface.

- -
    -
  • TODO: explain all this cert stuff to the user.
    • -
  • TODO: add instrux for installing certificate.
    • -
  • TODO: add steps for after you have installed certificate.
    • -
      -""" # TODO complete first_boot handling # Make sure the user is not stuck on a dead end for now. - with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db: - db['state']=5 + with sqlite_db(cfg.store_file, table='firstboot', autocommit=True) as \ + database: + database['state'] = 5 - # TODO: Update state to 2 and head there - # with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db: - # db['state']=1 - # # TODO: switch to HTTPS - # raise cherrypy.InternalRedirect('state1') - - return self.fill_template( - template="base", - title=_("Installing the Certificate"), - main=main, - sidebar_right=sidebar_right) - -sidebar_right=_("""Getting Help

      We've done our best to make your FreedomBox easy to use. If you have questions during setup, there are a few places to turn for help. TODO: add links to such help.

      """) + return util.render_template(template='firstboot_state1', + title=_('Installing the Certificate')) diff --git a/modules/installed/help/help.py b/modules/installed/help/help.py index e05123bf5..927f9e6c6 100644 --- a/modules/installed/help/help.py +++ b/modules/installed/help/help.py @@ -3,6 +3,9 @@ import cherrypy from gettext import gettext as _ from plugin_mount import PagePlugin import cfg +import util + + class Help(PagePlugin): order = 20 # order of running init in PagePlugins def __init__(self, *args, **kwargs): @@ -17,61 +20,15 @@ class Help(PagePlugin): @cherrypy.expose def index(self): - main=""" -

      There are a variety of places to go for help with Plinth - and the box it runs on.

      - -

      This front end has a developer's manual. It isn't - complete, but it is the first place to look. Feel free to - offer suggestions, edits, and screenshots for completing - it!

      - -

      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.

      - -

      There - are Debian gurus in the \#debian channels of both - irc.freenode.net and irc.oftc.net. They probably don't know - much about the %(box)s and almost surely know nothing of - this front end, but they are an incredible resource for - general Debian issues.

      - -

      There is no FAQ because - the question frequency is currently zero for all - questions.

      - """ % {'box':cfg.box_name} - return self.fill_template(title="Documentation and FAQ", main=main) + return util.render_template(template='help', + title=_('Documentation and FAQ')) @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 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 - protections over it. By giving back power to the users over - their networks and machines, we are returning the Internet to - its intended peer-to-peer architecture.

      + return util.render_template( + template='about', + title=_('About the {box_name}').format(box_name=cfg.box_name)) -

      In order to bring about the new network order, it is - paramount that it is easy to convert to it. The hardware it - 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.

      -

      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 FreedomBox project, see the - Debian - Wiki.

      - """)) class View(PagePlugin): def __init__(self, *args, **kwargs): @@ -82,7 +39,8 @@ class View(PagePlugin): def default(self, page=''): if page not in ['design', 'plinth', 'hacking', 'faq']: raise cherrypy.HTTPError(404, "The path '/help/view/%s' was not found." % page) - return self.fill_template(template="err", main="

      Sorry, as much as I would like to show you that page, I don't seem to have a page named %s!

      " % page) + with open(os.path.join("doc", "%s.part.html" % page), 'r') as IF: main = IF.read() - return self.fill_template(title=_("%s Documentation" % cfg.product_name), main=main) + return util.render_template(title=_("%s Documentation" % + cfg.product_name), main=main) diff --git a/modules/installed/help/templates/about.html b/modules/installed/help/templates/about.html new file mode 100644 index 000000000..2f4a39b81 --- /dev/null +++ b/modules/installed/help/templates/about.html @@ -0,0 +1,61 @@ +{% extends 'login_nav.html' %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + + + +

      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 protections over it. By giving back power to the users over +their networks and machines, we are returning the Internet to its +intended peer-to-peer architecture.

      + +

      In order to bring about the new network order, it is +paramount that it is easy to convert to it. The hardware it +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.

      + +

      Learn more +»

      + +{% endblock %} + +{% block sidebar_right_block %} + +
      + +

      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 FreedomBox project, see the + Debian Wiki.

      + +
      + +{% endblock %} diff --git a/modules/installed/help/templates/help.html b/modules/installed/help/templates/help.html new file mode 100644 index 000000000..17aaedea4 --- /dev/null +++ b/modules/installed/help/templates/help.html @@ -0,0 +1,45 @@ +{% extends 'login_nav.html' %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      There are a variety of places to go for help with +{{ cfg.product_name }} and the box it runs on.

      + +

      This front end has a +developer's manual. It isn't complete, but it is the first place +to look. Feel free to offer suggestions, edits, and screenshots for +completing it!

      + +

      A +section of the Debian wiki is devoted to the {{ cfg.box_name }}. +At some point the documentation in the wiki and the documentation in +the manual should dovetail.

      + +

      There are Debian gurus in the #debian channels of both +irc.freenode.net and irc.oftc.net. They probably don't know much +about the {{ cfg.box_name }} and almost surely know nothing of this +front end, but they are an incredible resource for general Debian +issues.

      + +

      There is no FAQ because +the question frequency is currently zero for all questions.

      + +{% endblock %} diff --git a/modules/installed/lib/auth.py b/modules/installed/lib/auth.py index 71b10c387..974ecef93 100644 --- a/modules/installed/lib/auth.py +++ b/modules/installed/lib/auth.py @@ -67,12 +67,14 @@ def check_credentials(username, passphrase): cfg.log(error) return error - bad_authentication = "Bad user-name or password." + bad_authentication = "Bad username or password." hashed_password = None - if username in cfg.users: - if "passphrase" in cfg.users[username]: - hashed_password = cfg.users[username]['passphrase'] + if username not in cfg.users or 'passphrase' not in cfg.users[username]: + cfg.log(bad_authentication) + return bad_authentication + + hashed_password = cfg.users[username]['passphrase'] try: # time-dependent comparison when non-ASCII characters are used. diff --git a/modules/installed/lib/auth_page.py b/modules/installed/lib/auth_page.py index 49d7a8de4..1d9b49ca3 100644 --- a/modules/installed/lib/auth_page.py +++ b/modules/installed/lib/auth_page.py @@ -1,43 +1,73 @@ +""" +Controller to provide login and logout actions +""" + import cherrypy import cfg +from django import forms +from gettext import gettext as _ from plugin_mount import PagePlugin -from modules.forms import Form -from auth import * -# Controller to provide login and logout actions +import auth +import util + + +class LoginForm(forms.Form): # pylint: disable-msg=W0232 + """Login form""" + from_page = forms.CharField(widget=forms.HiddenInput(), required=False) + + username = forms.CharField(label=_('Username')) + password = forms.CharField(label=_('Passphrase'), + widget=forms.PasswordInput()) + + def clean(self): + """Check for valid credentials""" + # pylint: disable-msg=E1101 + if 'username' in self._errors or 'password' in self._errors: + return self.cleaned_data + + error_msg = auth.check_credentials(self.cleaned_data['username'], + self.cleaned_data['password']) + if error_msg: + raise forms.ValidationError(error_msg, code='invalid_credentials') + + return self.cleaned_data + class AuthController(PagePlugin): + """Login and logout pages""" + def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) - self.register_page("auth") + + self.register_page('auth') def on_login(self, username): """Called on successful login""" - + def on_logout(self, username): """Called on logout""" - - def get_loginform(self, username, msg='', from_page=cfg.server_dir+"/"): - form = Form(title="Login", action=cfg.server_dir + "/auth/login", message=msg) - form.text_input(name="from_page", value=from_page, type="hidden") - form.text_input("Username", name="username", value=username) - form.text_input("Passphrase", name="passphrase", type="password") - form.submit(label="Login") - return self.fill_template(main=form.render(), sidebar_right=" ") - @cherrypy.expose - def login(self, username=None, passphrase=None, from_page=cfg.server_dir+"/", **kwargs): - if username is None or passphrase is None: - return self.get_loginform("", from_page=from_page) - - error_msg = check_credentials(username, passphrase) - if error_msg: - return self.get_loginform(username, error_msg, from_page) + def login(self, from_page=cfg.server_dir+"/", **kwargs): + """Serve the login page""" + form = None + + if kwargs: + form = LoginForm(kwargs, prefix='auth') + # pylint: disable-msg=E1101 + if form.is_valid(): + username = form.cleaned_data['username'] + cherrypy.session[cfg.session_key] = username + cherrypy.request.login = username + self.on_login(username) + raise cherrypy.HTTPRedirect(from_page or + (cfg.server_dir + "/")) else: - cherrypy.session[cfg.session_key] = cherrypy.request.login = username - self.on_login(username) - raise cherrypy.HTTPRedirect(from_page or (cfg.server_dir + "/")) - + form = LoginForm(prefix='auth') + + return util.render_template(template='form', title=_('Login'), + form=form, submit_text=_('Login')) + @cherrypy.expose def logout(self, from_page=cfg.server_dir+"/"): sess = cherrypy.session @@ -46,4 +76,5 @@ class AuthController(PagePlugin): if username: cherrypy.request.login = None self.on_logout(username) + raise cherrypy.HTTPRedirect(from_page or (cfg.server_dir + "/")) diff --git a/modules/installed/lib/forms.py b/modules/installed/lib/forms.py deleted file mode 100644 index 4980efd37..000000000 --- a/modules/installed/lib/forms.py +++ /dev/null @@ -1,151 +0,0 @@ -""" -The Form class is a helper class that takes parameters and method -calls and can return html for a form with appropriate hooks for css -styling. It should allow you to display a form but have the -formatting and styling added by the class. You can worry less about -how it looks while still getting consistent, decent-looking forms. - -Take a look at the FirstBoot class for an example of forms in action. - -Copyright 2011-2013 James Vasile - -This software is released to you (yes, you) under the terms of the GNU -Affero General Public License, version 3 or later, available at -. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. -""" -class Form(): - def __init__(self, action=None, cls='form', title=None, onsubmit=None, name=None, message='', method="post"): - - action = self.get_form_attrib_text('action', action) - onsubmit = self.get_form_attrib_text('onsubmit', onsubmit) - name = self.get_form_attrib_text('name', name) - - self.pretext = '
      \n' % (cls, method, action, onsubmit, name) - if title: - self.pretext += '

      %s

      \n' % title - - if message: - self.message = "

      %s

      " % message - else: - self.message = '' - self.text = '' - self.end_text = "
      \n" - def get_form_attrib_text(self, field, val): - if val: - return ' %s="%s"' % (field, val) - else: - return '' - def html(self, html): - self.text += html - def dropdown(self, label='', name=None, id=None, vals=None, select=None, onchange=''): - """vals is a list of values. - select is the index in vals of the selected item. None means no item is selected yet.""" - name, id = self.name_or_id(name, id) - self.text += (""" \n""" - - def dotted_quad(self, label='', name=None, id=None, quad=None): - name, id = self.name_or_id(name, id) - if not quad: - 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]} - - def text_input(self, label='', name=None, id=None, type='text', value='', size=20): - name, id = self.name_or_id(name, id) - if type=="hidden": - self.text += '' % (type, name, id, value) - else: - self.text += """ """ % (label, type, name, id, value, size) - def hidden(self, name=None, id=None, value=''): - self.text_input(type="hidden", name=name, id=id, value=value) - def text_box(self, label='', name=None, id=None, value=""): - name, id = self.name_or_id(name, id) - self.text += """ - """ % (label, name, id, value) - def submit(self, label='', name=None, id=None): - name, id = self.name_or_id(name, id) - 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.""" - self.text += '
      ' % button_text - def name_or_id(self, name, id): - if not name: name = id - if not id: id = name - if not name: name = '' - if not id: id = '' - return name, id - def checkbox(self, label='', name='', id='', checked=''): - name, id = self.name_or_id(name, id) - if checked: - checked = 'checked="on"' - self.text += """ -
      -
      \n""" % (label, name, id, checked) - def radiobutton(self, label='', name='', id='', value='', checked=''): - name, id = self.name_or_id(name, id) - if checked: - checked = 'checked="on"' - self.text += """ -
      -
      \n""" % (label, name, id, value, checked) - def get_checkbox(self, name='', id=''): - return '\n' % self.name_or_id(name, id) - def render(self): - return self.pretext+self.message+self.text+self.end_text diff --git a/modules/installed/lib/user_store.py b/modules/installed/lib/user_store.py index 595e83893..41d13f947 100644 --- a/modules/installed/lib/user_store.py +++ b/modules/installed/lib/user_store.py @@ -1,8 +1,3 @@ -import os -try: - import simplejson as json -except ImportError: - import json import cherrypy import cfg from model import User diff --git a/modules/installed/privacy/privacy.py b/modules/installed/privacy/privacy.py index 802c42f81..8de533f88 100644 --- a/modules/installed/privacy/privacy.py +++ b/modules/installed/privacy/privacy.py @@ -3,6 +3,8 @@ from gettext import gettext as _ from plugin_mount import PagePlugin from modules.auth import require import cfg +import util + class Privacy(PagePlugin): order = 20 # order of running init in PagePlugins @@ -22,20 +24,5 @@ class Privacy(PagePlugin): @cherrypy.expose @require() def config(self): - main=""" -

      Privacy controls are not yet implemented. This page is a - placeholder and a promise: privacy is important enough that it - 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 -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 -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 -chance to refuse and also tells you who wants your data.

      -""") % cfg.product_name) + return util.render_template(template='privacy_config', + title=_('Privacy Control Panel')) diff --git a/modules/installed/privacy/templates/privacy_config.html b/modules/installed/privacy/templates/privacy_config.html new file mode 100644 index 000000000..cc3becb15 --- /dev/null +++ b/modules/installed/privacy/templates/privacy_config.html @@ -0,0 +1,46 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      Privacy controls are not yet implemented. This page is a +placeholder and a promise: privacy is important enough that it is a +founding consideration, not an afterthought.

      + +{% endblock %} + +{% block sidebar_right_block %} + +
      +

      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 {{ + cfg.product_name }} and the 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 chance to refuse and also tells you who wants your + data.

      +
      + +{% endblock %} diff --git a/modules/installed/privacy/templates/tor.html b/modules/installed/privacy/templates/tor.html new file mode 100644 index 000000000..85ebe5745 --- /dev/null +++ b/modules/installed/privacy/templates/tor.html @@ -0,0 +1,47 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      Tor is an anonymous communication system. You can learn more about +it from the Tor Project +website. For best protection when web surfing, the Tor Project +recommends that you use +the Tor +Browser Bundle.

      + +

      A Tor SOCKS port is available on your FreedomBox on TCP port +9050.

      + +

      Your FreedomBox is configured as a Tor bridge with obfsproxy, so it +can help circumvent censorship. If your FreedomBox is behind a router +or firewall, you should make sure the following ports are open, and +port-forwarded, if necessary:

      + + + {% for name, port in tor_ports.items %} + + + + + {% endfor %} +
      {{ name }}{{ port }}
      + +{% endblock %} diff --git a/modules/installed/privacy/tor.py b/modules/installed/privacy/tor.py index 78a60d068..404553629 100644 --- a/modules/installed/privacy/tor.py +++ b/modules/installed/privacy/tor.py @@ -25,6 +25,8 @@ from plugin_mount import PagePlugin from modules.auth import require import actions import cfg +import util + class tor(PagePlugin): order = 30 # order of running init in PagePlugins @@ -38,24 +40,14 @@ class tor(PagePlugin): def index(self): output, error = actions.superuser_run("tor-get-ports") port_info = output.split("\n") - ports = {} + tor_ports = {} for line in port_info: try: (key, val) = line.split() - ports[key] = val + tor_ports[key] = val except ValueError: continue - main = _(""" -

      Tor is an anonymous communication system. You can learn more about it from the Tor Project website. For best protection when web surfing, the Tor Project recommends that you use the Tor Browser Bundle.

      -

      A Tor SOCKS port is available on your FreedomBox on TCP port 9050.

      -

      Your FreedomBox is configured as a Tor bridge with obfsproxy, so it can help circumvent censorship. If your FreedomBox is behind a router or firewall, you should make sure the following ports are open, and port-forwarded, if necessary:

      - """) - - main += '' - for key in ports: - main += "" - main += "" - main += "
      " + str(key) + "" + str(ports[key]) + "
      " - - return self.fill_template(title=_("Tor Control Panel"), main=main) + return util.render_template(template='tor', + title=_('Tor Control Panel'), + tor_ports=tor_ports) diff --git a/modules/installed/router/info.py b/modules/installed/router/info.py index 9b1f6ff85..cc9c5539a 100644 --- a/modules/installed/router/info.py +++ b/modules/installed/router/info.py @@ -1,6 +1,8 @@ import cherrypy from plugin_mount import PagePlugin from modules.auth import require +import util + class Info(PagePlugin): title = 'Info' @@ -13,6 +15,7 @@ class Info(PagePlugin): @cherrypy.expose @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.

      + return util.render_template(title="Router Information", main=""" +

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

      """) diff --git a/modules/installed/router/pagekite.py b/modules/installed/router/pagekite.py index 666d1a0fe..799a8860d 100644 --- a/modules/installed/router/pagekite.py +++ b/modules/installed/router/pagekite.py @@ -20,14 +20,14 @@ Plinth module for configuring PageKite service """ import cherrypy +from django import forms +from django.core import validators from gettext import gettext as _ import actions import cfg -from forms import Form from modules.auth import require -from plugin_mount import PagePlugin, FormPlugin -import re +from plugin_mount import PagePlugin import util @@ -39,83 +39,103 @@ class PageKite(PagePlugin): PagePlugin.__init__(self, *args, **kwargs) self.register_page("router.setup.pagekite") - self.register_page("router.setup.pagekite.configure") cfg.html_root.router.setup.menu.add_item( _("Public Visibility (PageKite)"), "icon-flag", "/router/setup/pagekite", 50) + @staticmethod @cherrypy.expose @require() - def index(self, **kwargs): - """Serve introcution page""" + def index(**kwargs): + """Serve introdution page""" del kwargs # Unused - main = _(""" -

      PageKite is a system for exposing {box_name} services when you -don't have a direct connection to the Internet. You only need this -service if your {box_name} services are unreachable from the rest of -the Internet. This includes the following situations:

      + menu = {'title': _('PageKite'), + 'items': [{'url': '/router/setup/pagekite/configure', + 'text': _('Configure PageKite')}]} + sidebar_right = util.render_template(template='menu_block', menu=menu) -
        -
      • {box_name} is behind a restricted firewall.
        • - -
      • {box_name} is connected to a (wireless) router which you don't - control.
        • - -
      • Your ISP does not provide you an external IP address and instead - provides Internet connection through NAT.
        • - -
      • Your ISP does not provide you a static IP address and your IP - address changes evertime you connect to Internet.
        • - -
      • Your ISP limits incoming connections.
        • -
      - -

      PageKite works around NAT, firewalls and IP-address limitations by -using a combination of tunnels and reverse proxies. Currently, -exposing web server and SSH server are supported. An intermediary -server with direct Internet access is required. Currently, only -pagekite.net server is supported and you will need an account -there. In future, it might be possible to use your buddy's {box_name} -for this.

      - -

      Configure -PageKite

      -""").format(box_name=cfg.box_name, server_dir=cfg.server_dir) - - sidebar_right = _(''' -PageKite -

      Configure -PageKite

      ''').format(server_dir=cfg.server_dir) - - return self.fill_template(title=_("Public Visibility (PageKite)"), - main=main, sidebar_right=sidebar_right) + return util.render_template(template='pagekite_introduction', + title=_("Public Visibility (PageKite)"), + sidebar_right=sidebar_right) -class configure(FormPlugin, PagePlugin): # pylint: disable-msg=C0103 +class TrimmedCharField(forms.CharField): + """Trim the contents of a CharField""" + def clean(self, value): + """Clean and validate the field value""" + if value: + value = value.strip() + + return super(TrimmedCharField, self).clean(value) + + +class ConfigureForm(forms.Form): # pylint: disable-msg=W0232 + """Form to configure PageKite""" + enabled = forms.BooleanField(label=_('Enable PageKite'), + required=False) + + server = forms.CharField( + label=_('Server'), required=False, + help_text=_('Currently only pagekite.net server is supported'), + widget=forms.TextInput(attrs={'placeholder': 'pagekite.net', + 'disabled': 'disabled'})) + + kite_name = TrimmedCharField( + label=_('Kite name'), + help_text=_('Example: mybox1-myacc.pagekite.me'), + validators=[ + validators.RegexValidator(r'^[\w-]{1,63}(\.[\w-]{1,63})*$', + _('Invalid kite name'))]) + + kite_secret = TrimmedCharField( + label=_('Kite secret'), + help_text=_('A secret associated with the kite or the default secret \ +for your account if no secret is set on the kite')) + + http_enabled = forms.BooleanField( + label=_('Web Server (HTTP)'), required=False, + help_text=_('Site will be available at \ +http://mybox1-myacc.pagekite.me \ +')) + + ssh_enabled = forms.BooleanField( + label=_('Secure Shell (SSH)'), required=False, + help_text=_('See SSH client setup instructions')) + + +class Configure(PagePlugin): # pylint: disable-msg=C0103 """Main configuration form""" order = 65 - url = ["/router/setup/pagekite/configure"] + def __init__(self, *args, **kwargs): + PagePlugin.__init__(self, *args, **kwargs) - js = """ - -""" + if kwargs: + form = ConfigureForm(kwargs, prefix='pagekite') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(status, form.cleaned_data, messages) + status = self.get_status() + form = ConfigureForm(initial=status, prefix='pagekite') + else: + form = ConfigureForm(initial=status, prefix='pagekite') + + return util.render_template(template='pagekite_configure', + title=_('Configure PageKite'), form=form, + messages=messages) def get_status(self): """ @@ -144,99 +164,11 @@ $('#pagekite-enable').change(function() { status['service'] = {} for service in ('http', 'ssh'): output = self._run(['get-service-status', service]) - status['service'][service] = (output.split()[0] == 'enabled') + status[service + '_enabled'] = (output.split()[0] == 'enabled') return status - def main(self, *args, **kwargs): - """Build and return the main content area which is the form""" - del args # unused - - status = self.get_status() - - if not status: - return _(''' -

      PageKite is not installed, please install it. PageKite comes -pre-installed with {box_name}. On any Debian based system (such as -{box_name}) you may install it using the command 'aptitude install -pagekite'

      ''').format(box_name=cfg.box_name) - - try: - message = kwargs['message'].text - except KeyError: - message = None - form = Form( - title="Configure PageKite", - action=cfg.server_dir + "/router/setup/pagekite/configure/", - name="configure_pagekite_form", message=message) - - form.checkbox(_("Enable PageKite"), name="pagekite_enable", - id="pagekite-enable", checked=status['enabled']) - - show_form = "block" if status['enabled'] else "none" - form.html(''' -
      '''.format(show_form=show_form)) - - form.html(_("

      PageKite Account

      ")) - form.text_input(_("Server"), name="pagekite_server", - id="pagekite-server", value="pagekite.net") - form.text_input(_("Kite name"), name="pagekite_kite_name", - id="pagekite-kite-name", value=status['kite_name']) - form.text_input(_("Kite secret"), name="pagekite_kite_secret", - id="pagekite-kite-secret", value=status['kite_secret']) - - form.html(_("

      Services

      ")) - form.checkbox(_("Web Server (HTTP)"), name="pagekite_http_enable", - id="pagekite-http-enable", - checked=status['service']['http']) - form.checkbox(_("Secure Shell (SSH)"), name="pagekite_ssh_enable", - id="pagekite-ssh-enable", - checked=status['service']['ssh']) - - form.html("
      ") # pagekite-post-enable-form - - form.submit(_("Update setup")) - return form.render() - - def process_form(self, **kwargs): - """Handle form submission""" - status = self.get_status() - - message, new_status = self.validate_form(**kwargs) - if not message.text: - self.apply_changes(status, new_status, message) - - return message - - @staticmethod - def validate_form(**kwargs): - """Check whether all the input form values are correct""" - new_status = {} - message = util.Message() - - domain_name_re = r'^[\w-]{1,63}(\.[\w-]{1,63})*$' - pagekite_kite_name = kwargs.get('pagekite_kite_name', '').strip() - if not re.match(domain_name_re, pagekite_kite_name): - message.add(_('Invalid kite name')) - else: - new_status['kite_name'] = pagekite_kite_name - - pagekite_kite_secret = kwargs.get('pagekite_kite_secret', '').strip() - if not pagekite_kite_secret: - message.add(_('Invalid kite secret')) - else: - new_status['kite_secret'] = pagekite_kite_secret - - new_status['enabled'] = (kwargs.get('pagekite_enable') == 'on') - new_status['service'] = { - 'http': (kwargs.get('pagekite_http_enable') == 'on'), - 'ssh': (kwargs.get('pagekite_ssh_enable') == 'on') - } - - return message, new_status - - def apply_changes(self, old_status, new_status, message): + def _apply_changes(self, old_status, new_status, messages): """Apply the changes to PageKite configuration""" cfg.log.info('New status is - %s' % new_status) @@ -246,27 +178,29 @@ pagekite'

      ''').format(box_name=cfg.box_name) if old_status['enabled'] != new_status['enabled']: if new_status['enabled']: self._run(['set-status', 'enable']) - message.add(_('PageKite enabled')) + messages.append(('success', _('PageKite enabled'))) else: self._run(['set-status', 'disable']) - message.add(_('PageKite disabled')) + messages.append(('success', _('PageKite disabled'))) if old_status['kite_name'] != new_status['kite_name'] or \ old_status['kite_secret'] != new_status['kite_secret']: self._run(['set-kite', '--kite-name', new_status['kite_name'], '--kite-secret', new_status['kite_secret']]) - message.add(_('Kite details set')) + messages.append(('success', _('Kite details set'))) - for service, old_value in old_status['service'].items(): - if old_value != new_status['service'][service]: - if new_status['service'][service]: + for service in ['http', 'ssh']: + if old_status[service + '_enabled'] != \ + new_status[service + '_enabled']: + if new_status[service + '_enabled']: self._run(['set-service-status', service, 'enable']) - message.add(_('Service enabled: {service}') - .format(service=service)) + messages.append(('success', _('Service enabled: {service}') + .format(service=service))) else: self._run(['set-service-status', service, 'disable']) - message.add(_('Service disabled: {service}') - .format(service=service)) + messages.append(('success', + _('Service disabled: {service}') + .format(service=service))) if old_status != new_status: self._run(['start']) diff --git a/modules/installed/router/router.py b/modules/installed/router/router.py index 105d3d69d..2cc75d980 100644 --- a/modules/installed/router/router.py +++ b/modules/installed/router/router.py @@ -1,154 +1,150 @@ -from urlparse import urlparse -import os, cherrypy +import cherrypy +from django import forms from gettext import gettext as _ -from plugin_mount import PagePlugin, PluginMount, FormPlugin +from plugin_mount import PagePlugin from modules.auth import require -from forms import Form -from util import * import cfg +import util + + +class Router(PagePlugin): + """Router page""" + order = 9 # order of running init in PagePlugins -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", "icon-retweet", "/router", 10) - self.menu.add_item("Wireless", "icon-signal", "/router/wireless", 12) - self.menu.add_item("Firewall", "icon-fire", "/router/firewall", 18) - self.menu.add_item("Hotspot and Mesh", "icon-map-marker", "/router/hotspot") - self.menu.add_item("Info", "icon-list-alt", "/router/info", 100) + PagePlugin.__init__(self, args, kwargs) + self.register_page('router') + + self.menu = cfg.main_menu.add_item('Router', 'icon-retweet', '/router', + 10) + self.menu.add_item('Wireless', 'icon-signal', '/router/wireless', 12) + self.menu.add_item('Firewall', 'icon-fire', '/router/firewall', 18) + self.menu.add_item('Hotspot and Mesh', 'icon-map-marker', + '/router/hotspot') + self.menu.add_item('Info', 'icon-list-alt', '/router/info', 100) + + @staticmethod @cherrypy.expose - def index(self): + def index(): """This isn't an internal redirect, because we need the url to reflect that we've moved down into the submenu hierarchy. Otherwise, it's hard to know which menu portion to make active or expand or contract.""" raise cherrypy.HTTPRedirect(cfg.server_dir + '/router/setup') + @staticmethod @cherrypy.expose @require() - def wireless(self): - return self.fill_template(title="Wireless", main="

      wireless setup: essid, etc.

      ") + def wireless(): + """Serve the wireless page""" + return util.render_template(title="Wireless", + main="

      wireless setup: essid, etc.

      ") + @staticmethod @cherrypy.expose @require() - def firewall(self): - return self.fill_template(title="Firewall", main="

      Iptables twiddling.

      ") + def firewall(): + """Serve the firewall page""" + return util.render_template(title="Firewall", + main="

      Iptables twiddling.

      ") + @staticmethod @cherrypy.expose @require() - def hotspot(self): - return self.fill_template(title="Hotspot and Mesh", main="

      connection sharing setup.

      ") + def hotspot(): + """Serve the hotspot page""" + return util.render_template(title="Hotspot and Mesh", + main="

      connection sharing setup.

      ") +class WANForm(forms.Form): # pylint: disable-msg=W0232 + """WAN setup form""" + connection_type = forms.ChoiceField( + label=_('Connection Type'), + choices=[('dhcp', _('DHCP')), ('static_ip', _('Static IP'))]) -class setup(PagePlugin): + wan_ip = forms.IPAddressField(label=_('WAN IP Address'), required=False) + + subnet_mask = forms.IPAddressField(label=_('Subnet Mask'), required=False) + + dns_1 = forms.IPAddressField(label=_('Static DNS 1'), required=False) + + dns_2 = forms.IPAddressField(label=_('Static DNS 2'), required=False) + + dns_3 = forms.IPAddressField(label=_('Static DNS 3'), required=False) + + +class Setup(PagePlugin): + """Router setup page""" def __init__(self, *args, **kwargs): - self.register_page("router.setup") - self.menu = cfg.html_root.router.menu.add_item("General Setup", "icon-cog", "/router/setup", 10) - self.menu.add_item("Dynamic DNS", "icon-flag", "/router/setup/ddns", 20) - self.menu.add_item("MAC Address Clone", "icon-barcode", "/router/setup/mac_address", 30) + PagePlugin.__init__(self, args, kwargs) + + self.register_page('router.setup') + + self.menu = cfg.html_root.router.menu.add_item( + 'General Setup', 'icon-cog', '/router/setup', 10) + self.menu.add_item('Dynamic DNS', 'icon-flag', '/router/setup/ddns', + 20) + self.menu.add_item('MAC Address Clone', 'icon-barcode', + '/router/setup/mac_address', 30) @cherrypy.expose @require() - def index(self): - parts = self.forms('/router/setup') - parts['title'] = "General Router Setup" - 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.

      -""" % cfg.box_name + parts['sidebar_right'] - if not cfg.users.expert(): - parts['main'] += """

      In basic mode, you don't need to do any - router setup before you can go online. Just plug your - %(product)s in to your cable or DSL modem and the router - will try to get you on the internet using DHCP.

      + def index(self, **kwargs): + """Return the setup page""" + status = self.get_status() -

      If that fails, you might need to resort to the expert - options. Enable expert mode in the "%(product)s System / - Configure" menu.

      """ % {'product':cfg.box_name} + form = None + messages = [] + + if kwargs: + form = WANForm(kwargs, prefix='router') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(status, form.cleaned_data, messages) + status = self.get_status() + form = WANForm(initial=status, prefix='router') else: - parts['main'] += "

      router name, domain name, router IP, dhcp

      " - return self.fill_template(**parts) + form = WANForm(initial=status, prefix='router') + return util.render_template(template='router_setup', + title=_('General Router Setup'), + form=form, messages=messages) + + @staticmethod @cherrypy.expose @require() - def ddns(self): - return self.fill_template(title="Dynamic DNS", main="

      Masquerade setup

      ") + def ddns(): + """Return the DDNS page""" + return util.render_template(title="Dynamic DNS", + main="

      Masquerade setup

      ") + @staticmethod @cherrypy.expose @require() - def mac_address(self): - return self.fill_template(title="MAC Address Cloning", - main="

      Your router can pretend to have a different MAC address on any interface.

      ") + def mac_address(): + """Return the MAC address page""" + return util.render_template( + title="MAC Address Cloning", + main="

      Your router can pretend to have a different MAC address \ +on any interface.

      ") + @staticmethod + def get_status(): + """Return the current status""" + store = util.filedict_con(cfg.store_file, 'router') + return {'connection_type': store.get('connection_type', 'dhcp')} -class wan(FormPlugin, PagePlugin): - url = ["/router/setup"] - order = 10 + @staticmethod + def _apply_changes(old_status, new_status, messages): + """Apply the changes""" + print 'Apply changes - %s, %s', old_status, new_status + if old_status['connection_type'] == new_status['connection_type']: + return - js = """ -""" - - def sidebar_right(self, *args, **kwargs): - side='' - if cfg.users.expert(): - side += """WAN Connection Type -

      DHCP

      DHCP allows your router to automatically - connect with the upstream network. If you are unsure what - option to choose, stick with DHCP. It is usually - correct. - -

      Static IP

      If you want to setup your connection - manually, you can enter static IP information. This option is - for those who know what they're doing. As such, it is only - available in expert mode.

      """ - return side - - def main(self, wan_ip0=0, wan_ip1=0, wan_ip2=0, wan_ip3=0, - subnet0=0, subnet1=0, subnet2=0, subnet3=0, - gateway0=0, gateway1=0, gateway2=0, gateway3=0, - dns10=0, dns11=0, dns12=0, dns13=0, - dns20=0, dns21=0, dns22=0, dns23=0, - dns30=0, dns31=0, dns32=0, dns33=0, - message=None, **kwargs): - if not cfg.users.expert(): - return '' - - store = filedict_con(cfg.store_file, 'router') - defaults = {'connect_type': 'DHCP'} - for key, value in defaults.items(): - if not key in kwargs: - try: - kwargs[key] = store[key] - except KeyError: - store[key] = kwargs[key] = value - - form = Form(title="WAN Connection", - action=cfg.server_dir + "/router/setup/wan/index", - name="wan_connection_form", - message=message) - form.dropdown('Connection Type', vals=["DHCP", "Static IP"], id="connect_type") - form.html('
      ') - form.dotted_quad("WAN IP Address", name="wan_ip", quad=[wan_ip0, wan_ip1, wan_ip2, wan_ip3]) - form.dotted_quad("Subnet Mask", name="subnet", quad=[subnet0, subnet1, subnet2, subnet3]) - form.dotted_quad("Gateway", name="gateway", quad=[gateway0, gateway1, gateway2, gateway3]) - form.dotted_quad("Static DNS 1", name="dns1", quad=[dns10, dns11, dns12, dns13]) - form.dotted_quad("Static DNS 2", name="dns2", quad=[dns20, dns21, dns22, dns23]) - form.dotted_quad("Static DNS 3", name="dns3", quad=[dns30, dns31, dns32, dns33]) - form.html('
      ') - form.submit("Set Wan") - return form.render() + store = util.filedict_con(cfg.store_file, 'router') + store['connection_type'] = new_status['connection_type'] + messages.append(('success', _('Connection type set'))) + messages.append(('info', _('IP address settings unimplemented'))) diff --git a/modules/installed/router/templates/pagekite_configure.html b/modules/installed/router/templates/pagekite_configure.html new file mode 100644 index 000000000..dd31c47de --- /dev/null +++ b/modules/installed/router/templates/pagekite_configure.html @@ -0,0 +1,77 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + +{% if pagekite_status = 'not_installed' %} + +

      PageKite is not installed, please install it. PageKite comes + pre-installed with {{ cfg.box_name }}. On any Debian based system + (such as {{ cfg.box_name }}) you may install it using the command + 'aptitude install pagekite'

      + +{% else %} + + {% include 'messages.html' %} + +
      + {% csrf_token %} + + {% include 'bootstrapform/field.html' with field=form.enabled %} + +
      +

      PageKite Account

      + {% include 'bootstrapform/field.html' with field=form.server %} + {% include 'bootstrapform/field.html' with field=form.kite_name %} + {% include 'bootstrapform/field.html' with field=form.kite_secret %} + +

      Services

      + {% include 'bootstrapform/field.html' with field=form.http_enabled %} + {% include 'bootstrapform/field.html' with field=form.ssh_enabled %} +
      + + + +
      + +{% endif %} + +{% endblock %} + +{% block js_block %} + {{ js|safe }} + + +{% endblock %} diff --git a/modules/installed/router/templates/pagekite_introduction.html b/modules/installed/router/templates/pagekite_introduction.html new file mode 100644 index 000000000..f6619c9a1 --- /dev/null +++ b/modules/installed/router/templates/pagekite_introduction.html @@ -0,0 +1,56 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} +

      PageKite is a system for exposing {{ cfg.box_name }} services when +you don't have a direct connection to the Internet. You only need this +service if your {{ cfg.box_name }} services are unreachable from the +rest of the Internet. This includes the following situations:

      + +
        +
      • {{ cfg.box_name }} is behind a restricted firewall.
        • + +
      • {{ cfg.box_name }} is connected to a (wireless) router which you + don't control.
        • + +
      • Your ISP does not provide you an external IP address and instead + provides Internet connection through NAT.
        • + +
      • Your ISP does not provide you a static IP address and your IP + address changes evertime you connect to Internet.
        • + +
      • Your ISP limits incoming connections.
        • +
      + +

      PageKite works around NAT, firewalls and IP-address limitations by +using a combination of tunnels and reverse proxies. Currently, +exposing web server and SSH server are supported. An intermediary +server with direct Internet access is required. Currently, only +pagekite.net server is supported and you will need an account +there. In future, it might be possible to use your buddy's +{{ cfg.box_name }} for this.

      + +

      + Configure + PageKite +

      + +{% endblock %} diff --git a/modules/installed/router/templates/router_setup.html b/modules/installed/router/templates/router_setup.html new file mode 100644 index 000000000..c484c5585 --- /dev/null +++ b/modules/installed/router/templates/router_setup.html @@ -0,0 +1,117 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +{% if cfg.users.expert %} + +

      WAN Connection

      + + {% include 'messages.html' %} + +
      + {% csrf_token %} + + {% include 'bootstrapform/field.html' with field=form.connection_type %} + +
      + {% include 'bootstrapform/field.html' with field=form.wan_ip %} + {% include 'bootstrapform/field.html' with field=form.subnet_mask %} + {% include 'bootstrapform/field.html' with field=form.dns_1 %} + {% include 'bootstrapform/field.html' with field=form.dns_2 %} + {% include 'bootstrapform/field.html' with field=form.dns_3 %} +
      + + + +
      + +{% else %} + +

      In basic mode, you don't need to do any router setup before you + can go online. Just plug your {{ cfg.product_name }} in to your + cable or DSL modem and the router will try to get you on the + internet using DHCP.

      + +

      If that fails, you might need to resort to the expert options. + Enable expert mode in the "{{ cfg.product_name }} / System / + Configure" menu.

      + +{% endif %} + +{% endblock %} + +{% block sidebar_right_block %} + +
      + +

      Introduction

      + +

      Your {{ cfg.box_name }} 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.

      + + {% if cfg.users.expert %} + +

      WAN Connection Type

      + +

      DHCP

      + +

      DHCP allows your router to automatically connect with the + upstream network. If you are unsure what option to choose, + stick with DHCP. It is usually correct.

      + +

      Static IP

      + +

      If you want to setup your connection manually, you can enter + static IP information. This option is for those who know what + they're doing. As such, it is only available in expert + mode.

      + + {% endif %} + +
      + +{% endblock %} + +{% block js_block %} + {{ js|safe }} + + + +{% endblock %} diff --git a/modules/installed/santiago/santiago.py b/modules/installed/santiago/santiago.py index 6d179c50b..b052daab7 100644 --- a/modules/installed/santiago/santiago.py +++ b/modules/installed/santiago/santiago.py @@ -7,10 +7,6 @@ haven't figured that one all the way through yet. import os, sys import cherrypy -try: - import simplejson as json -except ImportError: - import json from gettext import gettext as _ from plugin_mount import PagePlugin from modules.auth import require diff --git a/modules/installed/services/services.py b/modules/installed/services/services.py index 5a7427c2c..0bf5fb698 100644 --- a/modules/installed/services/services.py +++ b/modules/installed/services/services.py @@ -2,6 +2,8 @@ import cherrypy from modules.auth import require from plugin_mount import PagePlugin import cfg +import util + class Services(PagePlugin): order = 9 # order of running init in PagePlugins @@ -18,9 +20,4 @@ class Services(PagePlugin): @cherrypy.expose @require() def openid(self): - return self.fill_template(title="Open ID", main='', sidebar_right=""" -One Login for Every Site

      Your %s is also an OpenID -machine. It can generate credentials that allow you to log in to many -websites without the need to remember or enter a separate username and -password at each one.

      -""" % cfg.box_name) + return util.render_template(template='openid', title="Open ID") diff --git a/modules/installed/services/templates/openid.html b/modules/installed/services/templates/openid.html new file mode 100644 index 000000000..69d6ab8a6 --- /dev/null +++ b/modules/installed/services/templates/openid.html @@ -0,0 +1,29 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      One Login for Every Site

      + +

      Your {{ cfg.box_name }} is also an OpenID machine. It can generate +credentials that allow you to log in to many websites without the need +to remember or enter a separate username and password at each one.

      + +{% endblock %} diff --git a/modules/installed/services/templates/xmpp_configure.html b/modules/installed/services/templates/xmpp_configure.html new file mode 100644 index 000000000..718d7d353 --- /dev/null +++ b/modules/installed/services/templates/xmpp_configure.html @@ -0,0 +1,36 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + + {% include 'messages.html' %} + +
      + {% csrf_token %} + + {{ form|bootstrap }} + + + +
      + +{% endblock %} diff --git a/modules/installed/services/templates/xmpp_register.html b/modules/installed/services/templates/xmpp_register.html new file mode 100644 index 000000000..bfb7c3de4 --- /dev/null +++ b/modules/installed/services/templates/xmpp_register.html @@ -0,0 +1,36 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + + {% include 'messages.html' %} + +
      + {% csrf_token %} + + {{ form|bootstrap }} + + + +
      + +{% endblock %} diff --git a/modules/installed/services/xmpp.py b/modules/installed/services/xmpp.py index 46063bfc1..767411432 100644 --- a/modules/installed/services/xmpp.py +++ b/modules/installed/services/xmpp.py @@ -1,20 +1,28 @@ import cherrypy +from django import forms from gettext import gettext as _ from modules.auth import require -from plugin_mount import PagePlugin, FormPlugin +from plugin_mount import PagePlugin import cfg -from forms import Form import actions import service -from util import Message +import util -class xmpp(PagePlugin): + +SIDE_MENU = {'title': _('XMPP'), + 'items': [{'url': '/services/xmpp/configure', + 'text': 'Configure XMPP Server'}, + {'url': '/services/xmpp/register', + 'text': 'Register XMPP Account'}]} + + +class XMPP(PagePlugin): + """XMPP Page""" def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) - self.register_page("services.xmpp") - self.register_page("services.xmpp.configure") - self.register_page("services.xmpp.register") - cfg.html_root.services.menu.add_item("XMPP", "icon-comment", "/services/xmpp", 40) + self.register_page('services.xmpp') + cfg.html_root.services.menu.add_item('XMPP', 'icon-comment', + '/services/xmpp', 40) self.client_service = service.Service( 'xmpp-client', _('Chat Server - client connections'), @@ -26,97 +34,156 @@ class xmpp(PagePlugin): 'xmpp-bosh', _('Chat Server - web interface'), is_external=True, enabled=True) + @staticmethod + @cherrypy.expose + @require() + def index(**kwargs): + """Serve XMPP page""" + del kwargs # Unused + main = "

      XMPP Server Accounts and Configuration

      " + + sidebar_right = util.render_template(template='menu_block', + menu=SIDE_MENU) + return util.render_template(title="XMPP Server", main=main, + sidebar_right=sidebar_right) + + +class ConfigureForm(forms.Form): # pylint: disable-msg=W0232 + """Configuration form""" + inband_enabled = forms.BooleanField( + label=_('Allow In-Band Registration'), required=False, + help_text=_('When enabled, anyone who can reach this server will be \ +allowed to register an account through an XMPP client')) + + # XXX: Only present due to issue with submitting empty form + dummy = forms.CharField(label='Dummy', initial='dummy', + widget=forms.HiddenInput()) + + +class Configure(PagePlugin): + """Configuration page""" + + def __init__(self, *args, **kwargs): + PagePlugin.__init__(self, *args, **kwargs) + self.register_page("services.xmpp.configure") + @cherrypy.expose @require() def index(self, **kwargs): - main = "

      XMPP Server Accounts and Configuration

      " - sidebar_right = 'Configure XMPP Server
      ' - sidebar_right = sidebar_right + 'Register XMPP Account' - return self.fill_template(title="XMPP Server", main=main, sidebar_right=sidebar_right) + """Serve the configuration form""" + status = self.get_status() -class configure(FormPlugin, PagePlugin): - url = ["/services/xmpp/configure"] + form = None + messages = [] - sidebar_left = '' - sidebar_right = _("Configure XMPP Server") + if kwargs: + form = ConfigureForm(kwargs, prefix='xmpp') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(status, form.cleaned_data, messages) + status = self.get_status() + form = ConfigureForm(initial=status, prefix='xmpp') + else: + form = ConfigureForm(initial=status, prefix='xmpp') - def main(self, xmpp_inband_enable=False, message=None, *args, **kwargs): - output, error = actions.superuser_run("xmpp-setup", 'status') + sidebar_right = util.render_template(template='menu_block', + menu=SIDE_MENU) + return util.render_template(template='xmpp_configure', + title=_('Configure XMPP Server'), + form=form, messages=messages, + sidebar_right=sidebar_right) + + @staticmethod + def get_status(): + """Return the current status""" + output, error = actions.run('xmpp-setup', 'status') if error: - raise Exception("something is wrong: " + error) - if "inband_enable" in output.split(): - xmpp_inband_enable = True + raise Exception('Error getting status: %s' % error) - form = Form(title="Configure XMPP Server", - action=cfg.server_dir + "/services/xmpp/configure/index", - name="configure_xmpp_form", - message=message) - form.checkbox(_("Allow In-Band Registration"), name="xmpp_inband_enable", - id="xmpp_inband_enable", checked=xmpp_inband_enable) - # hidden field is needed because checkbox doesn't post if not checked - form.hidden(name="submitted", value="True") - form.html(_("

      When enabled, anyone who can reach this server will be allowed to register an account through an XMPP client.

      ")) - form.submit(_("Update setup")) - return form.render() + return {'inband_enabled': 'inband_enable' in output.split()} - def process_form(self, **kwargs): - checkedinfo = { - 'inband_enable' : False, - } + @staticmethod + def sidebar_right(**kwargs): + """Return rendered string for sidebar on the right""" + del kwargs # Unused - opts = [] - for k in kwargs.keys(): - if 'on' == kwargs[k]: - shortk = k.split("xmpp_").pop() - checkedinfo[shortk] = True + return util.render_template(template='menu_block', menu=SIDE_MENU) - for key in checkedinfo.keys(): - if checkedinfo[key]: - opts.append(key) - else: - opts.append('no'+key) - actions.run("xmpp-setup", opts) + @staticmethod + def _apply_changes(old_status, new_status, messages): + """Apply the form changes""" + cfg.log.info('Status - %s, %s' % (old_status, new_status)) - main = self.main(checkedinfo['inband_enable']) - return self.fill_template(title="XMPP Server Configuration", main=main, sidebar_left=self.sidebar_left, sidebar_right=self.sidebar_right) + if old_status['inband_enabled'] == new_status['inband_enabled']: + messages.append(('info', _('Setting unchanged'))) + return -class register(FormPlugin, PagePlugin): - url = ["/services/xmpp/register"] + if new_status['inband_enabled']: + messages.append(('success', _('Inband registration enabled'))) + option = 'inband_enable' + else: + messages.append(('success', _('Inband registration disabled'))) + option = 'noinband_enable' - sidebar_left = '' - sidebar_right = _("Register XMPP Account") + cfg.log.info('Option - %s' % option) - def main(self, username='', message=None, *args, **kwargs): - form = Form(title="Register XMPP Account", - action=cfg.server_dir + "/services/xmpp/register/index", - name="register_xmpp_form", - message=message) - form.text_input(_("Username"), name="username", value=username) - form.text_input(_("Password"), name="password", type="password") - form.submit(label=_("Register XMPP Account"), name="register") - return form.render() + _output, error = actions.superuser_run('xmpp-setup', [option]) + del _output + if error: + raise Exception('Error running command - %s' % error) - def process_form(self, username=None, password=None, **kwargs): - msg = Message() - if not username: msg.add = _("Must specify a username!") - if not password: msg.add = _("Must specify a password!") +class RegisterForm(forms.Form): # pylint: disable-msg=W0232 + """Configuration form""" + username = forms.CharField(label=_('Username')) - if username and password: - output, error = actions.superuser_run( - "xmpp-register", [username, password]) - if error: - raise Exception("something is wrong: " + error) + password = forms.CharField( + label=_('Password'), widget=forms.PasswordInput()) - if "successfully registered" in output: - msg.add = _("Registered account for %s." % username) - else: - msg.add = _("Failed to register account for %s: %s" % (username, output)) - cfg.log(msg.text) - main = self.main(username, msg=msg.text) - return self.fill_template( - title="XMPP Server Configuration", - main=main, - sidebar_left=self.sidebar_left, - sidebar_right=self.sidebar_right) +class Register(PagePlugin): + """User registration page""" + + def __init__(self, *args, **kwargs): + PagePlugin.__init__(self, *args, **kwargs) + self.register_page('services.xmpp.register') + + @cherrypy.expose + @require() + def index(self, **kwargs): + """Serve the registration form""" + form = None + messages = [] + + if kwargs: + form = RegisterForm(kwargs, prefix='xmpp') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._register_user(form.cleaned_data, messages) + form = RegisterForm(prefix='xmpp') + else: + form = RegisterForm(prefix='xmpp') + + sidebar_right = util.render_template(template='menu_block', + menu=SIDE_MENU) + return util.render_template(template='xmpp_register', + title=_('Register XMPP Account'), + form=form, messages=messages, + sidebar_right=sidebar_right) + + @staticmethod + def _register_user(data, messages): + """Register a new XMPP user""" + output, error = actions.superuser_run( + 'xmpp-register', [data['username'], data['password']]) + if error: + raise Exception('Error registering user - %s' % error) + + if 'successfully registered' in output: + messages.append(('success', + _('Registered account for %s' % + data['username']))) + else: + messages.append(('error', + _('Failed to register account for %s: %s') % + (data['username'], output))) diff --git a/modules/installed/sharing/file_explorer.py b/modules/installed/sharing/file_explorer.py index ed23b5053..c56cdb504 100644 --- a/modules/installed/sharing/file_explorer.py +++ b/modules/installed/sharing/file_explorer.py @@ -1,7 +1,10 @@ import cherrypy +from gettext import gettext as _ from modules.auth import require from plugin_mount import PagePlugin import cfg +import util + class FileExplorer(PagePlugin): def __init__(self, *args, **kwargs): @@ -12,24 +15,5 @@ class FileExplorer(PagePlugin): @cherrypy.expose @require() def index(self): - main = """ -

      File explorer for users that also have shell accounts.

      Until -that is written (and it will be a while), we should install mollify or ajaxplorer, but -of which seem to have some support for playing media files in the -browser (as opposed to forcing users to download and play them -locally). The downsides to third-party explorers are: they're don't -fit within our theme system, they require separate login, and they're -written in php, which will make integrating them hard.

      - -

      There are, of course, many other options for php-based file -explorers. These were the ones I saw that might do built-in media -players.

      - -

      For python-friendly options, check out FileManager. -It appears to be mostly javascript with some bindings to make it -python-friendly.

      -""" - return self.fill_template(title="File Explorer", main=main, sidebar_right='') + return util.render_template(template='file_explorer', + title=_('File Explorer')) diff --git a/modules/installed/sharing/sharing.py b/modules/installed/sharing/sharing.py index 3a0de623b..81e004c20 100644 --- a/modules/installed/sharing/sharing.py +++ b/modules/installed/sharing/sharing.py @@ -3,6 +3,8 @@ from gettext import gettext as _ from modules.auth import require from plugin_mount import PagePlugin import cfg +import util + class Sharing(PagePlugin): order = 9 # order of running init in PagePlugins @@ -24,13 +26,9 @@ class Sharing(PagePlugin): @cherrypy.expose @require() def files(self): - return self.fill_template(title="File Server", main='', sidebar_right=_(""" -Freedom NAS

      The %s can make your spare hard drives accessible to your -local network, thus acting as a NAS server. We currently support -sharing files via NFS and SMB. + return util.render_template(template='sharing', + title=_('File Server')) -TODO: this is not true. We currently support no sharing.

      -""" % cfg.box_name)) #TODO: move PrinterSharing to another file, as it should be an optional module (most people don't care about printer sharing) class PrinterSharing(PagePlugin): @@ -42,12 +40,5 @@ class PrinterSharing(PagePlugin): @cherrypy.expose @require() def index(self): - main = """ -

      TODO: Setup and install SAMBA

      -

      TODO: Setup and install CUPS

      -""" - return self.fill_template(title="Printer Sharing", main=main, sidebar_right=""" -Share Your Printer

      The %s can share your printer via Samba and CUPS.

      -""" % cfg.box_name) - - + return util.render_template(template='sharing_printer', + title=_('Printer Sharing')) diff --git a/modules/installed/sharing/templates/file_explorer.html b/modules/installed/sharing/templates/file_explorer.html new file mode 100644 index 000000000..a7f98b232 --- /dev/null +++ b/modules/installed/sharing/templates/file_explorer.html @@ -0,0 +1,42 @@ +{% extends 'login_nav.html' %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      File explorer for users that also have shell accounts.

      Until +that is written (and it will be a while), we should +install mollify +or ajaxplorer, +but of which seem to have some support for playing media files in the +browser (as opposed to forcing users to download and play them +locally). The downsides to third-party explorers are: they're don't +fit within our theme system, they require separate login, and they're +written in php, which will make integrating them hard.

      + +

      There are, of course, many other options for php-based file +explorers. These were the ones I saw that might do built-in media +players.

      + +

      For python-friendly options, check out FileManager. +It appears to be mostly javascript with some bindings to make it +python-friendly.

      + +{% endblock %} diff --git a/modules/installed/sharing/templates/sharing.html b/modules/installed/sharing/templates/sharing.html new file mode 100644 index 000000000..020c3edfe --- /dev/null +++ b/modules/installed/sharing/templates/sharing.html @@ -0,0 +1,33 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block sidebar_right_block %} + +
      +

      Freedom NAS

      + +

      The {{ cfg.box_name }} can make your spare hard drives + accessible to your local network, thus acting as a NAS server. We + currently support sharing files via NFS and SMB.

      + +

      TODO: this is not true. We currently support no sharing.

      +
      + +{% endblock %} diff --git a/modules/installed/sharing/templates/sharing_printer.html b/modules/installed/sharing/templates/sharing_printer.html new file mode 100644 index 000000000..05ef7fb3e --- /dev/null +++ b/modules/installed/sharing/templates/sharing_printer.html @@ -0,0 +1,37 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      TODO: Setup and install SAMBA

      +

      TODO: Setup and install CUPS

      + +{% endblock %} + +{% block sidebar_right_block %} + +
      +

      Share Your Printer

      + +

      The {{ cfg.box_name }} can share your printer via Samba and + CUPS.

      +
      + +{% endblock %} diff --git a/modules/installed/system/config.py b/modules/installed/system/config.py index 6e1f62e2a..808681f2e 100644 --- a/modules/installed/system/config.py +++ b/modules/installed/system/config.py @@ -20,68 +20,136 @@ Plinth module for configuring timezone, hostname etc. """ import cherrypy +from django import forms +from django.core import validators from gettext import gettext as _ -try: - import simplejson as json -except ImportError: - import json -import os +import re import socket import actions import cfg -from forms import Form from modules.auth import require -from plugin_mount import PagePlugin, FormPlugin +from plugin_mount import PagePlugin import util -class Config(PagePlugin): +def get_hostname(): + """Return the hostname""" + return socket.gethostname() + + +class TrimmedCharField(forms.CharField): + """Trim the contents of a CharField""" + def clean(self, value): + """Clean and validate the field value""" + if value: + value = value.strip() + + return super(TrimmedCharField, self).clean(value) + + +class ConfigurationForm(forms.Form): + """Main system configuration form""" + time_zone = forms.ChoiceField( + label=_('Time Zone'), + help_text=_('Set your timezone to get accurate timestamps. \ +This information will be used to set your systemwide timezone')) + + # We're more conservative than RFC 952 and RFC 1123 + hostname = TrimmedCharField( + label=_('Hostname'), + help_text=_('Your hostname is the local name by which other machines \ +on your LAN can reach you. It must be alphanumeric, start with an alphabet \ +and must not be greater than 63 characters in length.'), + validators=[ + validators.RegexValidator(r'^[a-zA-Z][a-zA-Z0-9]{,62}$', + _('Invalid hostname'))]) + + def __init__(self, *args, **kwargs): + # pylint: disable-msg=E1101, W0233 + forms.Form.__init__(self, *args, **kwargs) + + self.fields['time_zone'].choices = [(zone, zone) + for zone in self.get_time_zones()] + + @staticmethod + def get_time_zones(): + """Return list of available time zones""" + time_zones = [] + for line in open('/usr/share/zoneinfo/zone.tab'): + if re.match(r'^(#|\s*$)', line): + continue + + try: + time_zones.append(line.split()[2]) + except IndexError: + pass + + time_zones.sort() + return time_zones + + +class Configuration(PagePlugin): """System configuration page""" def __init__(self, *args, **kwargs): del args # Unused del kwargs # Unused - self.register_page("sys.config") + self.register_page('sys.config') + + self.menu = cfg.html_root.sys.menu.add_item(_('Configure'), 'icon-cog', + '/sys/config', 10) @cherrypy.expose @require() - def index(self): - """Serve configuration page""" - parts = self.forms('/sys/config') - parts['title'] = _("Configure this {box_name}") \ - .format(box_name=cfg.box_name) + def index(self, **kwargs): + """Serve the configuration form""" + status = self.get_status() - return self.fill_template(**parts) # pylint: disable-msg=W0142 + form = None + messages = [] + if kwargs and cfg.users.expert(): + form = ConfigurationForm(kwargs, prefix='configuration') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(status, form.cleaned_data, messages) + status = self.get_status() + form = ConfigurationForm(initial=status, + prefix='configuration') + else: + form = ConfigurationForm(initial=status, prefix='configuration') -def valid_hostname(name): - """ - Return '' if name is a valid hostname by our standards (not just - by RFC 952 and RFC 1123. We're more conservative than the - standard. If hostname isn't valid, return message explaining why. - """ - message = '' - if len(name) > 63: - message += "
      Hostname too long (max is 63 characters)" + return util.render_template(template='config', + title=_('General Configuration'), + form=form, messages=messages) - if not util.is_alphanumeric(name): - message += "
      Hostname must be alphanumeric" + @staticmethod + def get_status(): + """Return the current status""" + return {'hostname': get_hostname(), + 'time_zone': util.slurp('/etc/timezone').rstrip()} - if not name[0] in "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ": - message += "
      Hostname must start with a letter" + @staticmethod + def _apply_changes(old_status, new_status, messages): + """Apply the form changes""" + if old_status['hostname'] != new_status['hostname']: + set_hostname(new_status['hostname']) + messages.append(('success', _('Hostname set'))) + else: + messages.append(('info', _('Hostname is unchanged'))) - return message - - -def get_hostname(): - """Return the current hostname of the system""" - return socket.gethostname() - - -def get_time_zone(): - """Return currently set system's timezone""" - return util.slurp('/etc/timezone').rstrip() + if old_status['time_zone'] != new_status['time_zone']: + output, error = actions.superuser_run('timezone-change', + [new_status['time_zone']]) + del output # Unused + if error: + messages.append(('error', + _('Error setting time zone - %s') % error)) + else: + messages.append(('success', _('Time zone set'))) + else: + messages.append(('info', _('Time zone is unchanged'))) def set_hostname(hostname): @@ -101,82 +169,3 @@ def set_hostname(hostname): except OSError as exception: raise cherrypy.HTTPError(500, 'Updating hostname failed: %s' % exception) - -class general(FormPlugin, PagePlugin): - """Form to update hostname and time zone""" - url = ["/sys/config"] - order = 30 - - @staticmethod - def help(*args, **kwargs): - """Build and return the help content area""" - del args # Unused - del kwargs # Unused - - return _(''' -

      Set your timezone to get accurate timestamps. {product} will use -this information to set your {box}'s systemwide timezone.

      ''').format( - product=cfg.product_name, box=cfg.box_name) - - def main(self, message='', time_zone=None, **kwargs): - """Build and return the main content area which is the form""" - del kwargs # Unused - - if not cfg.users.expert(): - return _(''' -

      Only members of the expert group are allowed to see and modify the system -setup.

      ''') - - if not time_zone: - time_zone = get_time_zone() - - # Get the list of supported timezones and the index in that - # list of the current one - module_file = __file__ - if module_file.endswith(".pyc"): - module_file = module_file[:-1] - module_dir = os.path.dirname(os.path.realpath(module_file)) - time_zones_file = os.path.join(module_dir, 'time_zones') - time_zones = json.loads(util.slurp(time_zones_file)) - try: - time_zone_id = time_zones.index(time_zone) - except ValueError: - cfg.log.critical("Unknown Time Zone: %s" % time_zone) - raise cherrypy.HTTPError(500, "Unknown Time Zone: %s" % time_zone) - - # And now, the form. - form = Form(title=_("General Config"), - action=cfg.server_dir + "/sys/config/general/index", - name="config_general_form", - message=message) - form.html(self.help()) - form.dropdown(_("Time Zone"), name="time_zone", vals=time_zones, - select=time_zone_id) - form.html(''' -

      Your hostname is the local name by which other machines on your LAN -can reach you.

      ''') - form.text_input('Hostname', name='hostname', value=get_hostname()) - form.submit(_("Submit")) - - return form.render() - - @staticmethod - def process_form(time_zone='', hostname='', *args, **kwargs): - """Handle form submission""" - del args # Unused - del kwargs # Unused - - message = '' - if hostname != get_hostname(): - msg = valid_hostname(hostname) - if msg == '': - set_hostname(hostname) - else: - message += msg - - time_zone = time_zone.strip() - if time_zone != get_time_zone(): - cfg.log.info("Setting timezone to %s" % time_zone) - actions.superuser_run("timezone-change", [time_zone]) - - return message or "Settings updated." diff --git a/modules/installed/system/diagnostics.py b/modules/installed/system/diagnostics.py index b87afb68d..db05738a2 100644 --- a/modules/installed/system/diagnostics.py +++ b/modules/installed/system/diagnostics.py @@ -19,12 +19,14 @@ Plinth module for running diagnostics """ -import os, cherrypy +import cherrypy from gettext import gettext as _ from auth import require from plugin_mount import PagePlugin import actions import cfg +import util + class diagnostics(PagePlugin): order = 30 @@ -36,13 +38,8 @@ class diagnostics(PagePlugin): @cherrypy.expose @require() def index(self): - main = _(""" -

      The system diagnostic test will run a number of checks on your - system to confirm that network services are running and configured - properly. It may take a minute to complete.

      - """) - main += '

      Run diagnostic test »

      ' - return self.fill_template(title=_("System Diagnostics"), main=main) + return util.render_template(template='diagnostics', + title=_('System Diagnostics')) class test(PagePlugin): order = 31 @@ -53,17 +50,8 @@ class test(PagePlugin): @cherrypy.expose @require() def index(self): - main = '' output, error = actions.superuser_run("diagnostic-test") - - if error: - main += _("The diagnostic test encountered an error:
      ") - for line in error.split('\n'): - main += line + "
      " - - if output: - main += _("Output of diagnostic test:
      ") - for line in output.split('\n'): - main += line + "
      " - - return self.fill_template(title=_("Diagnostic Test"), main=main) + return util.render_template(template='diagnostics_test', + title=_('Diagnostic Test'), + diagnostics_output=output, + diagnostics_error=error) diff --git a/modules/installed/system/expert_mode.py b/modules/installed/system/expert_mode.py index dd6f11b49..041ce0793 100644 --- a/modules/installed/system/expert_mode.py +++ b/modules/installed/system/expert_mode.py @@ -1,73 +1,79 @@ -import os import cherrypy -try: - import simplejson as json -except ImportError: - import json +from django import forms from gettext import gettext as _ -from filedict import FileDict from modules.auth import require -from plugin_mount import PagePlugin, FormPlugin +from plugin_mount import PagePlugin import cfg -from forms import Form -from model import User -from util import * +import util -class experts(FormPlugin, PagePlugin): - url = ["/sys/config"] - order = 10 - def help(self, *args, **kwargs): - side = _(#"""Expert Mode - """ -

      The %(box)s can be administered in two modes, 'basic' - and 'expert'. Basic mode hides a lot of features and - configuration options that most users will never need to think - about. Expert mode allows you to get into the details.

      +class ExpertsForm(forms.Form): # pylint: disable-msg=W0232 + """Form to configure expert mode""" -

      Most users can operate the %(box)s by configuring the - limited number of options visible in Basic mode. For the sake - of simplicity and ease of use, we hid most of %(product)s's - less frequently used options. But if you want more - sophisticated features, you can enable Expert mode, and - %(product)s will present more advanced menu options.

      + expert_mode = forms.BooleanField( + label=_('Expert Mode'), required=False) -

      You should be aware that it might be possible to render - your %(box)s inaccessible via Expert mode options.

      - """ % {'box':cfg.box_name, 'product':cfg.product_name}) + # XXX: Only present due to issue with submitting empty form + dummy = forms.CharField(label='Dummy', initial='dummy', + widget=forms.HiddenInput()) - return side - def main(self, expert=None, message='', **kwargs): - """Note that kwargs contains '':"submit" if this is coming - from a submitted form. If kwargs is empty, it's a fresh form - with no user input, which means it should just reflect the - state of the stored data.""" - if not kwargs and expert == None: - expert = cfg.users.expert() - cfg.log("Expert mode is %s" % expert) - form = Form(title=_("Expert Mode"), - action=cfg.server_dir + "/sys/config/experts", - name="expert_mode_form", - message=message ) - form.html(self.help()) - form.checkbox(_("Expert Mode"), name="expert", checked=expert) - form.submit(_("Submit")) - return form.render() +class Experts(PagePlugin): + """Expert forms page""" + order = 60 - def process_form(self, expert='', *args, **kwargs): - user = cfg.users.get() + def __init__(self, *args, **kwargs): + PagePlugin.__init__(self, *args, **kwargs) + self.register_page('sys.config.expert') - message = 'settings unchanged' + cfg.html_root.sys.config.menu.add_item(_('Expert mode'), 'icon-cog', + '/sys/config/expert', 10) - if expert: + @cherrypy.expose + @require() + def index(self, **kwargs): + """Serve the configuration form""" + status = self.get_status() + + cfg.log.info('Args - %s' % kwargs) + + form = None + messages = [] + + if kwargs: + form = ExpertsForm(kwargs, prefix='experts') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(form.cleaned_data, messages) + status = self.get_status() + form = ExpertsForm(initial=status, prefix='experts') + else: + form = ExpertsForm(initial=status, prefix='experts') + + return util.render_template(template='expert_mode', + title=_('Expert Mode'), form=form, + messages=messages) + + @staticmethod + def get_status(): + """Return the current status""" + return {'expert_mode': cfg.users.expert()} + + @staticmethod + def _apply_changes(new_status, messages): + """Apply expert mode configuration""" + message = ('info', _('Settings unchanged')) + + user = cfg.users.current() + + if new_status['expert_mode']: if not 'expert' in user['groups']: user['groups'].append('expert') - message = "enabled" + message = ('success', _('Expert mode enabled')) else: if 'expert' in user['groups']: user['groups'].remove('expert') - message = "disabled" + message = ('success', _('Expert mode disabled')) - cfg.users.set(user) - return "Expert mode %s." % message + cfg.users.set(user['username'], user) + messages.append(message) diff --git a/modules/installed/system/firewall.py b/modules/installed/system/firewall.py index 069dfb658..e736627f1 100644 --- a/modules/installed/system/firewall.py +++ b/modules/installed/system/firewall.py @@ -27,6 +27,7 @@ import cfg from modules.auth import require from plugin_mount import PagePlugin import service as service_module +import util class Firewall(PagePlugin): @@ -48,89 +49,24 @@ class Firewall(PagePlugin): """Serve introcution page""" del kwargs # Unused - # XXX: Use templates here instead of generating HTML - main = _(''' -

      Firewall is a network security system that controls the incoming -and outgoing network traffic on your {box_name}. Keeping a firewall -enabled and properly configured reduces risk of security threat from -the Internet.

      - -

      The following the current status:

      -''').format(box_name=cfg.box_name) - if not self.get_installed_status(): - status = _(''' -

      Firewall is not installed. Please install it. Firewall comes -pre-installed with {box_name}. On any Debian based system (such as -{box_name}) you may install it using the command 'aptitude install -firewalld'

      ''').format(box_name=cfg.box_name) - - return self.fill_template(title=_("Firewall"), main=main + status) + return util.render_template(template='firewall', + title=_("Firewall"), + firewall_status='not_installed') if not self.get_enabled_status(): - status = _(''' -

      Firewall daemon is not running. Please run it. Firewall comes -enabled by default on {box_name}. On any Debian based system (such as -{box_name}) you may run it using the command 'service firewalld start' -or in case of system with systemd 'systemctl start firewalld'

      -''').format(box_name=cfg.box_name) + return util.render_template(template='firewall', + title=_("Firewall"), + firewall_status='not_running') - return self.fill_template(title=_("Firewall"), main=main + status) + internal_enabled_services = self.get_enabled_services(zone='internal') + external_enabled_services = self.get_enabled_services(zone='external') - internal_enabled_sevices = self.get_enabled_services(zone='internal') - external_enabled_sevices = self.get_enabled_services(zone='external') - - services_info = '
        ' - for service in service_module.SERVICES.values(): - if service.is_enabled(): - service_text = _('Enabled') - service_class = 'firewall-permitted' - else: - service_text = _('Disabled') - service_class = 'firewall-blocked' - - port_info = [] - for port in service.ports: - if port in internal_enabled_sevices and \ - port in external_enabled_sevices: - text = _('Permitted') - css_class = 'firewall-permitted' - elif port in internal_enabled_sevices: - text = _('Permitted (internal only)') - css_class = 'firewall-permitted' - elif port in external_enabled_sevices: - text = _('Permitted (external only)') - css_class = 'firewall-permitted' - else: - text = _('Blocked') - css_class = 'firewall-blocked' - - info = _(''' -
      • {port}: {text}
        • -''').format(port=port, css_class=css_class, text=text) - port_info.append(info) - - port_info = '
          {port_info}
        '.format( - port_info=''.join(port_info)) - - services_info += _(''' -
      • -{name}: {service_text} - {port_info} -
        • -''').format( - name=service.name, service_class=service_class, - service_text=service_text, port_info=port_info) - - services_info += '
      ' - - footnote = ''' -

      The operation of the firewall is automatic. When you enable a -service it is automatically permitted in the firewall and you disable -a service is automatically disabled in the firewall.

      ''' - - return self.fill_template(title=_("Firewall"), main=main + - services_info + footnote) + return util.render_template( + template='firewall', title=_('Firewall'), + services=service_module.SERVICES.values(), + internal_enabled_services=internal_enabled_services, + external_enabled_services=external_enabled_services) def get_installed_status(self): """Return whether firewall is installed""" diff --git a/modules/installed/system/packages.py b/modules/installed/system/packages.py index 276939358..63df8cab0 100644 --- a/modules/installed/system/packages.py +++ b/modules/installed/system/packages.py @@ -1,83 +1,133 @@ import cherrypy +from django import forms from gettext import gettext as _ from auth import require -from plugin_mount import PagePlugin, FormPlugin -from forms import Form +from plugin_mount import PagePlugin import actions import cfg -from util import Message +import util -class Packages(PagePlugin, FormPlugin): + +def get_modules_available(): + """Return list of all modules""" + output, error = actions.run('module-manager', ['list-available']) + if error: + raise Exception('Error getting modules: %s' % error) + + return output.split() + + +def get_modules_enabled(): + """Return list of all modules""" + output, error = actions.run('module-manager', ['list-enabled']) + if error: + raise Exception('Error getting enabled modules - %s' % error) + + return output.split() + + +class PackagesForm(forms.Form): + """Packages form""" + # XXX: Only present due to issue with submitting empty form + dummy = forms.CharField(label='Dummy', initial='dummy', + widget=forms.HiddenInput()) + + def __init__(self, *args, **kwargs): + # pylint: disable-msg=E1002, E1101 + super(forms.Form, self).__init__(*args, **kwargs) + + modules_available = get_modules_available() + + for module in modules_available: + label = _('Enable {module}').format(module=module) + self.fields[module + '_enabled'] = forms.BooleanField( + label=label, required=False) + + +class Packages(PagePlugin): + """Package page""" order = 20 def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) - self.register_page("sys.packages") - cfg.html_root.sys.menu.add_item("Package Manager", "icon-gift", "/sys/packages", 20) + self.register_page('sys.packages') + + cfg.html_root.sys.menu.add_item('Package Manager', 'icon-gift', + '/sys/packages', 20) @cherrypy.expose @require() def index(self, *args, **kwargs): - output, error = actions.run("module-manager", ["list-available"]) - if error: - raise Exception("something is wrong: " + error) - modules_available = output.split() - - output, error = actions.run("module-manager", \ - ["list-enabled", cfg.python_root]) - if error: - raise Exception("something is wrong: " + error) - modules_enabled = output.split() + """Serve the form""" + del args # Unused - if 'submitted' in kwargs: - del kwargs['submitted'] - modules_selected = map(lambda x: x.split("_")[0], kwargs.keys()) - for module in modules_available: - if module in modules_enabled: - if module not in modules_selected: - output, error = actions.superuser_run(\ - "module-manager",\ - ["disable", cfg.python_root, module]) - # TODO: need a smoother way for plinth - # to unload the module + status = self.get_status() + + form = None + messages = [] + + if kwargs: + form = PackagesForm(kwargs, prefix='packages') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(status, form.cleaned_data, messages) + status = self.get_status() + form = PackagesForm(initial=status, prefix='packages') + else: + form = PackagesForm(initial=status, prefix='packages') + + return util.render_template(template='packages', + title=_('Add/Remove Plugins'), + form=form, messages=messages) + + @staticmethod + def get_status(): + """Return the current status""" + modules_available = get_modules_available() + modules_enabled = get_modules_enabled() + + return {module + '_enabled': module in modules_enabled + for module in modules_available} + + @staticmethod + def _apply_changes(old_status, new_status, messages): + """Apply form changes""" + for field, enabled in new_status.items(): + if not field.endswith('_enabled'): + continue + + if old_status[field] == new_status[field]: + continue + + module = field.split('_enabled')[0] + if enabled: + output, error = actions.superuser_run( + 'module-manager', ['enable', cfg.python_root, module]) + del output # Unused + + # TODO: need to get plinth to load the module we just + # enabled + if error: + messages.append( + ('error', _('Error enabling module - {module}').format( + module=module))) else: - if module in modules_selected: - output, error = actions.superuser_run(\ - "module-manager",\ - ["enable", cfg.python_root, module]) - # TODO: need to get plinth to load - # the module we just enabled + messages.append( + ('success', _('Module enabled - {module}').format( + module=module))) + else: + output, error = actions.superuser_run( + 'module-manager', ['disable', cfg.python_root, module]) + del output # Unused - main = _(""" -

      aptitude purge modules

      -

      aptitude install modules

      -

      The modules should depend on the appropriate Debian packages.

      """) - main += self.form(self, Message(output), args, kwargs) - sidebar_right = _(""" -Help -

      On this page, you can add or remove %s plugins to your %s.

      -

      Plugins are just Debian packages, so Debian's usual package management features should make this job fairly easy.

      """ % (cfg.product_name, cfg.box_name)) - return self.fill_template(title=_("Add/Remove Plugins"), main=main, sidebar_right=sidebar_right) - - def form(self, message=None, *args, **kwargs): - output, error = actions.run("module-manager", ["list-available"]) - if error: - raise Exception("something is wrong: " + error) - modules_available = output.split() - - output, error = actions.run("module-manager",\ - ["list-enabled", cfg.python_root]) - if error: - raise Exception("something is wrong: " + error) - modules_enabled = output.split() - - form = Form(title="Manage Plugins", - action=cfg.server_dir + "/sys/packages/index", - name="manage_modules", - message=message) - for module in modules_available: - form.checkbox(_("Enable %s" % module), name="%s_enable" % module, id="%s_enable" % module, checked = True if module in modules_enabled else False) - form.hidden(name="submitted", value="True") - form.html(_("""

      Enabling a plugin will cause a corresponding page to appear in Plinth.

      """)) - form.submit(_("Update setup")) - return form.render() + # TODO: need a smoother way for plinth to unload the + # module + if error: + messages.append( + ('error', + _('Error disabling module - {module}').format( + module=module))) + else: + messages.append( + ('success', _('Module disabled - {module}').format( + module=module))) diff --git a/modules/installed/system/system.py b/modules/installed/system/system.py index 906a5b3ca..cfdf92515 100644 --- a/modules/installed/system/system.py +++ b/modules/installed/system/system.py @@ -1,17 +1,8 @@ -import os import cherrypy -try: - import simplejson as json -except ImportError: - import json from gettext import gettext as _ -from filedict import FileDict -from auth import require -from plugin_mount import PagePlugin, FormPlugin +from plugin_mount import PagePlugin import cfg -from forms import Form -from model import User -from util import * +import util sys_dir = "modules/installed/sys" @@ -22,15 +13,9 @@ class Sys(PagePlugin): PagePlugin.__init__(self, *args, **kwargs) self.register_page("sys") self.menu = cfg.main_menu.add_item(_("System"), "icon-cog", "/sys", 100) - self.menu.add_item(_("Configure"), "icon-cog", "/sys/config", 10) self.menu.add_item(_("Users and Groups"), "icon-user", "/sys/users", 15) @cherrypy.expose def index(self): - return self.fill_template(title=_("System Configuration"), main=_(""" -

      In this section, you can control the %(product)s's - underlying system, as opposed to its various applications and - services. These options affect the %(product)s at its most - general level. This is where you add/remove users, install - applications, reboot, etc.

      - """ % {'product':cfg.product_name})) + return util.render_template(template='system', + title=_("System Configuration")) diff --git a/modules/installed/system/templates/config.html b/modules/installed/system/templates/config.html new file mode 100644 index 000000000..5e5310481 --- /dev/null +++ b/modules/installed/system/templates/config.html @@ -0,0 +1,45 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + +{% if cfg.users.expert %} + + {% include 'messages.html' %} + +
      + {% csrf_token %} + + {{ form|bootstrap }} + + + +
      + +{% else %} + +

      Only members of the expert group are allowed to see and modify + the system setup.

      + +{% endif %} + +{% endblock %} diff --git a/modules/installed/system/templates/diagnostics.html b/modules/installed/system/templates/diagnostics.html new file mode 100644 index 000000000..afb597e34 --- /dev/null +++ b/modules/installed/system/templates/diagnostics.html @@ -0,0 +1,31 @@ +{% extends 'login_nav.html' %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      The system diagnostic test will run a number of checks on your +system to confirm that network services are running and configured +properly. It may take a minute to complete.

      + +

      Run diagnostic test +»

      + +{% endblock %} diff --git a/modules/installed/system/templates/diagnostics_test.html b/modules/installed/system/templates/diagnostics_test.html new file mode 100644 index 000000000..93012ab24 --- /dev/null +++ b/modules/installed/system/templates/diagnostics_test.html @@ -0,0 +1,33 @@ +{% extends 'login_nav.html' %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +{% if diagnostics_error %} +

      The diagnostic test encountered an error:

      + 

      {{ diagnostics_error }}
      +{% endif %} + +{% if diagnostics_output %} +

      Output of diagnostic test:

      + 
      {{ diagnostics_output }}
      +{% endif %} + +{% endblock %} diff --git a/modules/installed/system/templates/expert_mode.html b/modules/installed/system/templates/expert_mode.html new file mode 100644 index 000000000..c6df98b36 --- /dev/null +++ b/modules/installed/system/templates/expert_mode.html @@ -0,0 +1,51 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + + {% include 'messages.html' %} + +

      The {{ cfg.box_name }} can be administered in two modes, 'basic' + and 'expert'. Basic mode hides a lot of features and configuration + options that most users will never need to think about. Expert mode + allows you to get into the details.

      + +

      Most users can operate the {{ cfg.box_name }} by configuring the + limited number of options visible in Basic mode. For the sake of + simplicity and ease of use, we hid most of {{ cfg.product_name }}'s + less frequently used options. But if you want more sophisticated + features, you can enable Expert mode, and {{ cfg.product_name }} + will present more advanced menu options.

      + +

      You should be aware that it might be possible to render your + {{ cfg.box_name }} inaccessible via Expert mode options.

      + +
      + {% csrf_token %} + + {{ form|bootstrap }} + + + +
      + +{% endblock %} diff --git a/modules/installed/system/templates/firewall.html b/modules/installed/system/templates/firewall.html new file mode 100644 index 000000000..19c165a46 --- /dev/null +++ b/modules/installed/system/templates/firewall.html @@ -0,0 +1,94 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      Firewall is a network security system that controls the incoming +and outgoing network traffic on your {{ cfg.box_name }}. Keeping a +firewall enabled and properly configured reduces risk of security +threat from the Internet.

      + +

      The following the current status:

      + +{% if firewall_status = 'not_installed' %} +

      Firewall is not installed. Please install it. Firewall comes +pre-installed with {{ cfg.box_name }}. On any Debian based system +(such as {{ cfg.box_name }}) you may install it using the command 'aptitude +install firewalld'

      + +{% elif firewall_status = 'not_running' %} + +

      Firewall daemon is not running. Please run it. Firewall comes +enabled by default on {{ cfg.box_name }}. On any Debian based system +(such as {{ cfg.box_name }}) you may run it using the command 'service +firewalld start' or in case of a system with systemd 'systemctl start +firewalld'

      + +{% else %} + + + + + + + + + {% for service in services %} + + + + + + {% for port in service.ports %} + + + + + {% endfor %} + + {% endfor %} + + + +
      Service/PortStatus
      {{ service.name }} + {% if service.is_enabled %} + Enabled + {% else %} + Disabled + {% endif %} +
      {{ port }} + {% if port in internal_enabled_services and port in external_enabled_services %} + Permitted + {% elif port in internal_enabled_services %} + Permitted (internal only) + {% elif port in external_enabled_services %} + Permitted (external only) + {% else %} + Blocked + {% endif %} +
      + +

      The operation of the firewall is automatic. When you enable a +service it is automatically permitted in the firewall and you disable +a service is automatically disabled in the firewall.

      + +{% endif %} + +{% endblock %} diff --git a/modules/installed/system/templates/packages.html b/modules/installed/system/templates/packages.html new file mode 100644 index 000000000..d8d7d6164 --- /dev/null +++ b/modules/installed/system/templates/packages.html @@ -0,0 +1,63 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + + {% include 'messages.html' %} + +

      aptitude purge modules

      + +

      aptitude install modules

      + +

      The modules should depend on the appropriate Debian packages.

      + +

      Manage Plugins

      + +
      + {% csrf_token %} + + {{ form|bootstrap }} + +

      Enabling a plugin will cause a corresponding page to appear in + Plinth.

      + + + +
      + +{% endblock %} + +{% block sidebar_right_block %} + +
      + +

      Help

      + +

      On this page, you can add or remove {{ cfg.product_name }} + plugins to your {{ cfg.box_name }}.

      + +

      Plugins are just Debian packages, so Debian's usual package + management features should make this job fairly easy.

      + +
      + +{% endblock %} diff --git a/modules/installed/system/templates/system.html b/modules/installed/system/templates/system.html new file mode 100644 index 000000000..45d842319 --- /dev/null +++ b/modules/installed/system/templates/system.html @@ -0,0 +1,29 @@ +{% extends 'login_nav.html' %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% block main_block %} + +

      In this section, you can control the {{ cfg.product_name }}'s +underlying system, as opposed to its various applications and +services. These options affect the {{ cfg.product_name }} at its most +general level. This is where you add/remove users, install +applications, reboot, etc.

      + +{% endblock %} diff --git a/modules/installed/system/templates/users_add.html b/modules/installed/system/templates/users_add.html new file mode 100644 index 000000000..4afbc68c9 --- /dev/null +++ b/modules/installed/system/templates/users_add.html @@ -0,0 +1,52 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + + {% include 'messages.html' %} + +
      + {% csrf_token %} + + {{ form|bootstrap }} + + + +
      + +{% endblock %} + +{% block sidebar_right_block %} + +
      + +

      Add User

      + +

      Adding a user via this administrative + interface might create a system user. For + example, if you provide a user with ssh access, she will need a + system account. If you don't know what that means, don't worry + about it.

      + +
      + +{% endblock %} diff --git a/modules/installed/system/templates/users_edit.html b/modules/installed/system/templates/users_edit.html new file mode 100644 index 000000000..da1ef4136 --- /dev/null +++ b/modules/installed/system/templates/users_edit.html @@ -0,0 +1,57 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + + {% include 'messages.html' %} + +
      + {% csrf_token %} + + {{ form|bootstrap }} + + + +
      + +{% endblock %} + +{% block sidebar_right_block %} + +
      + +

      Edit Users

      + +

      Click on a user's name to go to a screen for editing that + user's account.

      + +

      Delete Users

      + +

      Check the box next to a users' names and then click "Delete + User" to remove users from {{ cfg.product_name }} and the + {{ cfg.box_name }} system.

      + +

      Deleting users is permanent!

      + +
      + +{% endblock %} diff --git a/modules/installed/system/templates/wan.html b/modules/installed/system/templates/wan.html new file mode 100644 index 000000000..ea83226d0 --- /dev/null +++ b/modules/installed/system/templates/wan.html @@ -0,0 +1,52 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + +{% if cfg.users.expert %} + + {% include 'messages.html' %} + +

      For security reasons, neither WAN Administration nor WAN SSH is + available to the `admin` user account.

      + +

      TODO: in expert mode, tell user they can ssh in to enable admin + from WAN, do their business, then disable it. It would be good to + enable the option and autodisable it when the ssh connection + dies.

      + +
      + {% csrf_token %} + + {{ form|bootstrap }} + + + +
      + +{% else %} + +

      This page is available only in expert mode.

      + +{% endif %} + +{% endblock %} diff --git a/modules/installed/system/time_zones b/modules/installed/system/time_zones deleted file mode 100644 index 58c8b7ad3..000000000 --- a/modules/installed/system/time_zones +++ /dev/null @@ -1,572 +0,0 @@ -[ - "Africa/Abidjan", - "Africa/Accra", - "Africa/Addis_Ababa", - "Africa/Algiers", - "Africa/Asmara", - "Africa/Asmera", - "Africa/Bamako", - "Africa/Bangui", - "Africa/Banjul", - "Africa/Bissau", - "Africa/Blantyre", - "Africa/Brazzaville", - "Africa/Bujumbura", - "Africa/Cairo", - "Africa/Casablanca", - "Africa/Ceuta", - "Africa/Conakry", - "Africa/Dakar", - "Africa/Dar_es_Salaam", - "Africa/Djibouti", - "Africa/Douala", - "Africa/El_Aaiun", - "Africa/Freetown", - "Africa/Gaborone", - "Africa/Harare", - "Africa/Johannesburg", - "Africa/Kampala", - "Africa/Khartoum", - "Africa/Kigali", - "Africa/Kinshasa", - "Africa/Lagos", - "Africa/Libreville", - "Africa/Lome", - "Africa/Luanda", - "Africa/Lubumbashi", - "Africa/Lusaka", - "Africa/Malabo", - "Africa/Maputo", - "Africa/Maseru", - "Africa/Mbabane", - "Africa/Mogadishu", - "Africa/Monrovia", - "Africa/Nairobi", - "Africa/Ndjamena", - "Africa/Niamey", - "Africa/Nouakchott", - "Africa/Ouagadougou", - "Africa/Porto-Novo", - "Africa/Sao_Tome", - "Africa/Timbuktu", - "Africa/Tripoli", - "Africa/Tunis", - "Africa/Windhoek", - "America/Adak", - "America/Anchorage", - "America/Anguilla", - "America/Antigua", - "America/Araguaina", - "America/Argentina/Buenos_Aires", - "America/Argentina/Catamarca", - "America/Argentina/ComodRivadavia", - "America/Argentina/Cordoba", - "America/Argentina/Jujuy", - "America/Argentina/La_Rioja", - "America/Argentina/Mendoza", - "America/Argentina/Rio_Gallegos", - "America/Argentina/Salta", - "America/Argentina/San_Juan", - "America/Argentina/San_Luis", - "America/Argentina/Tucuman", - "America/Argentina/Ushuaia", - "America/Aruba", - "America/Asuncion", - "America/Atikokan", - "America/Atka", - "America/Bahia", - "America/Bahia_Banderas", - "America/Barbados", - "America/Belem", - "America/Belize", - "America/Blanc-Sablon", - "America/Boa_Vista", - "America/Bogota", - "America/Boise", - "America/Buenos_Aires", - "America/Cambridge_Bay", - "America/Campo_Grande", - "America/Cancun", - "America/Caracas", - "America/Catamarca", - "America/Cayenne", - "America/Cayman", - "America/Chicago", - "America/Chihuahua", - "America/Coral_Harbour", - "America/Cordoba", - "America/Costa_Rica", - "America/Cuiaba", - "America/Curacao", - "America/Danmarkshavn", - "America/Dawson", - "America/Dawson_Creek", - "America/Denver", - "America/Detroit", - "America/Dominica", - "America/Edmonton", - "America/Eirunepe", - "America/El_Salvador", - "America/Ensenada", - "America/Fort_Wayne", - "America/Fortaleza", - "America/Glace_Bay", - "America/Godthab", - "America/Goose_Bay", - "America/Grand_Turk", - "America/Grenada", - "America/Guadeloupe", - "America/Guatemala", - "America/Guayaquil", - "America/Guyana", - "America/Halifax", - "America/Havana", - "America/Hermosillo", - "America/Indiana/Indianapolis", - "America/Indiana/Knox", - "America/Indiana/Marengo", - "America/Indiana/Petersburg", - "America/Indiana/Tell_City", - "America/Indiana/Vevay", - "America/Indiana/Vincennes", - "America/Indiana/Winamac", - "America/Indianapolis", - "America/Inuvik", - "America/Iqaluit", - "America/Jamaica", - "America/Jujuy", - "America/Juneau", - "America/Kentucky/Louisville", - "America/Kentucky/Monticello", - "America/Knox_IN", - "America/La_Paz", - "America/Lima", - "America/Los_Angeles", - "America/Louisville", - "America/Maceio", - "America/Managua", - "America/Manaus", - "America/Marigot", - "America/Martinique", - "America/Matamoros", - "America/Mazatlan", - "America/Mendoza", - "America/Menominee", - "America/Merida", - "America/Mexico_City", - "America/Miquelon", - "America/Moncton", - "America/Monterrey", - "America/Montevideo", - "America/Montreal", - "America/Montserrat", - "America/Nassau", - "America/New_York", - "America/Nipigon", - "America/Nome", - "America/Noronha", - "America/North_Dakota/Center", - "America/North_Dakota/New_Salem", - "America/Ojinaga", - "America/Panama", - "America/Pangnirtung", - "America/Paramaribo", - "America/Phoenix", - "America/Port-au-Prince", - "America/Port_of_Spain", - "America/Porto_Acre", - "America/Porto_Velho", - "America/Puerto_Rico", - "America/Rainy_River", - "America/Rankin_Inlet", - "America/Recife", - "America/Regina", - "America/Resolute", - "America/Rio_Branco", - "America/Rosario", - "America/Santa_Isabel", - "America/Santarem", - "America/Santiago", - "America/Santo_Domingo", - "America/Sao_Paulo", - "America/Scoresbysund", - "America/Shiprock", - "America/St_Barthelemy", - "America/St_Johns", - "America/St_Kitts", - "America/St_Lucia", - "America/St_Thomas", - "America/St_Vincent", - "America/Swift_Current", - "America/Tegucigalpa", - "America/Thule", - "America/Thunder_Bay", - "America/Tijuana", - "America/Toronto", - "America/Tortola", - "America/Vancouver", - "America/Virgin", - "America/Whitehorse", - "America/Winnipeg", - "America/Yakutat", - "America/Yellowknife", - "Antarctica/Casey", - "Antarctica/Davis", - "Antarctica/DumontDUrville", - "Antarctica/Macquarie", - "Antarctica/Mawson", - "Antarctica/McMurdo", - "Antarctica/Palmer", - "Antarctica/Rothera", - "Antarctica/South_Pole", - "Antarctica/Syowa", - "Antarctica/Vostok", - "Arctic/Longyearbyen", - "Asia/Aden", - "Asia/Almaty", - "Asia/Amman", - "Asia/Anadyr", - "Asia/Aqtau", - "Asia/Aqtobe", - "Asia/Ashgabat", - "Asia/Ashkhabad", - "Asia/Baghdad", - "Asia/Bahrain", - "Asia/Baku", - "Asia/Bangkok", - "Asia/Beirut", - "Asia/Bishkek", - "Asia/Brunei", - "Asia/Calcutta", - "Asia/Choibalsan", - "Asia/Chongqing", - "Asia/Chungking", - "Asia/Colombo", - "Asia/Dacca", - "Asia/Damascus", - "Asia/Dhaka", - "Asia/Dili", - "Asia/Dubai", - "Asia/Dushanbe", - "Asia/Gaza", - "Asia/Harbin", - "Asia/Ho_Chi_Minh", - "Asia/Hong_Kong", - "Asia/Hovd", - "Asia/Irkutsk", - "Asia/Istanbul", - "Asia/Jakarta", - "Asia/Jayapura", - "Asia/Jerusalem", - "Asia/Kabul", - "Asia/Kamchatka", - "Asia/Karachi", - "Asia/Kashgar", - "Asia/Kathmandu", - "Asia/Katmandu", - "Asia/Kolkata", - "Asia/Krasnoyarsk", - "Asia/Kuala_Lumpur", - "Asia/Kuching", - "Asia/Kuwait", - "Asia/Macao", - "Asia/Macau", - "Asia/Magadan", - "Asia/Makassar", - "Asia/Manila", - "Asia/Muscat", - "Asia/Nicosia", - "Asia/Novokuznetsk", - "Asia/Novosibirsk", - "Asia/Omsk", - "Asia/Oral", - "Asia/Phnom_Penh", - "Asia/Pontianak", - "Asia/Pyongyang", - "Asia/Qatar", - "Asia/Qyzylorda", - "Asia/Rangoon", - "Asia/Riyadh", - "Asia/Riyadh87", - "Asia/Riyadh88", - "Asia/Riyadh89", - "Asia/Saigon", - "Asia/Sakhalin", - "Asia/Samarkand", - "Asia/Seoul", - "Asia/Shanghai", - "Asia/Singapore", - "Asia/Taipei", - "Asia/Tashkent", - "Asia/Tbilisi", - "Asia/Tehran", - "Asia/Tel_Aviv", - "Asia/Thimbu", - "Asia/Thimphu", - "Asia/Tokyo", - "Asia/Ujung_Pandang", - "Asia/Ulaanbaatar", - "Asia/Ulan_Bator", - "Asia/Urumqi", - "Asia/Vientiane", - "Asia/Vladivostok", - "Asia/Yakutsk", - "Asia/Yekaterinburg", - "Asia/Yerevan", - "Atlantic/Azores", - "Atlantic/Bermuda", - "Atlantic/Canary", - "Atlantic/Cape_Verde", - "Atlantic/Faeroe", - "Atlantic/Faroe", - "Atlantic/Jan_Mayen", - "Atlantic/Madeira", - "Atlantic/Reykjavik", - "Atlantic/South_Georgia", - "Atlantic/St_Helena", - "Atlantic/Stanley", - "Australia/ACT", - "Australia/Adelaide", - "Australia/Brisbane", - "Australia/Broken_Hill", - "Australia/Canberra", - "Australia/Currie", - "Australia/Darwin", - "Australia/Eucla", - "Australia/Hobart", - "Australia/LHI", - "Australia/Lindeman", - "Australia/Lord_Howe", - "Australia/Melbourne", - "Australia/NSW", - "Australia/North", - "Australia/Perth", - "Australia/Queensland", - "Australia/South", - "Australia/Sydney", - "Australia/Tasmania", - "Australia/Victoria", - "Australia/West", - "Australia/Yancowinna", - "Brazil/Acre", - "Brazil/DeNoronha", - "Brazil/East", - "Brazil/West", - "CET", - "CST6CDT", - "Canada/Atlantic", - "Canada/Central", - "Canada/East-Saskatchewan", - "Canada/Eastern", - "Canada/Mountain", - "Canada/Newfoundland", - "Canada/Pacific", - "Canada/Saskatchewan", - "Canada/Yukon", - "Chile/Continental", - "Chile/EasterIsland", - "Cuba", - "EET", - "EST", - "EST5EDT", - "Egypt", - "Eire", - "Etc/GMT", - "Etc/GMT+0", - "Etc/GMT+1", - "Etc/GMT+10", - "Etc/GMT+11", - "Etc/GMT+12", - "Etc/GMT+2", - "Etc/GMT+3", - "Etc/GMT+4", - "Etc/GMT+5", - "Etc/GMT+6", - "Etc/GMT+7", - "Etc/GMT+8", - "Etc/GMT+9", - "Etc/GMT-0", - "Etc/GMT-1", - "Etc/GMT-10", - "Etc/GMT-11", - "Etc/GMT-12", - "Etc/GMT-13", - "Etc/GMT-14", - "Etc/GMT-2", - "Etc/GMT-3", - "Etc/GMT-4", - "Etc/GMT-5", - "Etc/GMT-6", - "Etc/GMT-7", - "Etc/GMT-8", - "Etc/GMT-9", - "Etc/GMT0", - "Etc/Greenwich", - "Etc/UCT", - "Etc/UTC", - "Etc/Universal", - "Etc/Zulu", - "Europe/Amsterdam", - "Europe/Andorra", - "Europe/Athens", - "Europe/Belfast", - "Europe/Belgrade", - "Europe/Berlin", - "Europe/Bratislava", - "Europe/Brussels", - "Europe/Bucharest", - "Europe/Budapest", - "Europe/Chisinau", - "Europe/Copenhagen", - "Europe/Dublin", - "Europe/Gibraltar", - "Europe/Guernsey", - "Europe/Helsinki", - "Europe/Isle_of_Man", - "Europe/Istanbul", - "Europe/Jersey", - "Europe/Kaliningrad", - "Europe/Kiev", - "Europe/Lisbon", - "Europe/Ljubljana", - "Europe/London", - "Europe/Luxembourg", - "Europe/Madrid", - "Europe/Malta", - "Europe/Mariehamn", - "Europe/Minsk", - "Europe/Monaco", - "Europe/Moscow", - "Europe/Nicosia", - "Europe/Oslo", - "Europe/Paris", - "Europe/Podgorica", - "Europe/Prague", - "Europe/Riga", - "Europe/Rome", - "Europe/Samara", - "Europe/San_Marino", - "Europe/Sarajevo", - "Europe/Simferopol", - "Europe/Skopje", - "Europe/Sofia", - "Europe/Stockholm", - "Europe/Tallinn", - "Europe/Tirane", - "Europe/Tiraspol", - "Europe/Uzhgorod", - "Europe/Vaduz", - "Europe/Vatican", - "Europe/Vienna", - "Europe/Vilnius", - "Europe/Volgograd", - "Europe/Warsaw", - "Europe/Zagreb", - "Europe/Zaporozhye", - "Europe/Zurich", - "GB", - "GB-Eire", - "GMT", - "GMT+0", - "Greenwich", - "HST", - "Hongkong", - "Iceland", - "Indian/Antananarivo", - "Indian/Chagos", - "Indian/Christmas", - "Indian/Cocos", - "Indian/Comoro", - "Indian/Kerguelen", - "Indian/Mahe", - "Indian/Maldives", - "Indian/Mauritius", - "Indian/Mayotte", - "Indian/Reunion", - "Iran", - "Israel", - "Jamaica", - "Japan", - "Kwajalein", - "Libya", - "MET", - "MST", - "MST7MDT", - "Mexico/BajaNorte", - "Mexico/BajaSur", - "Mexico/General", - "Mideast/Riyadh87", - "Mideast/Riyadh88", - "Mideast/Riyadh89", - "NZ", - "NZ-CHAT", - "Navajo", - "PRC", - "PST8PDT", - "Pacific/Apia", - "Pacific/Auckland", - "Pacific/Chatham", - "Pacific/Chuuk", - "Pacific/Easter", - "Pacific/Efate", - "Pacific/Enderbury", - "Pacific/Fakaofo", - "Pacific/Fiji", - "Pacific/Funafuti", - "Pacific/Galapagos", - "Pacific/Gambier", - "Pacific/Guadalcanal", - "Pacific/Guam", - "Pacific/Honolulu", - "Pacific/Johnston", - "Pacific/Kiritimati", - "Pacific/Kosrae", - "Pacific/Kwajalein", - "Pacific/Majuro", - "Pacific/Marquesas", - "Pacific/Midway", - "Pacific/Nauru", - "Pacific/Niue", - "Pacific/Norfolk", - "Pacific/Noumea", - "Pacific/Pago_Pago", - "Pacific/Palau", - "Pacific/Pitcairn", - "Pacific/Pohnpei", - "Pacific/Ponape", - "Pacific/Port_Moresby", - "Pacific/Rarotonga", - "Pacific/Saipan", - "Pacific/Samoa", - "Pacific/Tahiti", - "Pacific/Tarawa", - "Pacific/Tongatapu", - "Pacific/Truk", - "Pacific/Wake", - "Pacific/Wallis", - "Pacific/Yap", - "Poland", - "Portugal", - "ROC", - "ROK", - "Singapore", - "Turkey", - "UCT", - "US/Alaska", - "US/Aleutian", - "US/Arizona", - "US/Central", - "US/East-Indiana", - "US/Eastern", - "US/Hawaii", - "US/Indiana-Starke", - "US/Michigan", - "US/Mountain", - "US/Pacific", - "US/Pacific-New", - "US/Samoa", - "UTC", - "Universal", - "W-SU", - "Zulu" -] \ No newline at end of file diff --git a/modules/installed/system/users.py b/modules/installed/system/users.py index b2a7d2578..1b7550405 100644 --- a/modules/installed/system/users.py +++ b/modules/installed/system/users.py @@ -1,121 +1,172 @@ -import os, cherrypy +import cherrypy +from django import forms +from django.core import validators from gettext import gettext as _ -from auth import require, add_user -from plugin_mount import PagePlugin, FormPlugin +import auth +from auth import require +from plugin_mount import PagePlugin import cfg -from forms import Form -from util import * from model import User +import util -class users(PagePlugin): + +class Users(PagePlugin): order = 20 # order of running init in PagePlugins def __init__(self, *args, **kwargs): PagePlugin.__init__(self, *args, **kwargs) self.register_page("sys.users") - self.register_page("sys.users.add") - self.register_page("sys.users.edit") + + @staticmethod + @cherrypy.expose + @require() + def index(): + """Return a rendered users page""" + menu = {'title': _('Users and Groups'), + 'items': [{'url': '/sys/users/add', + 'text': _('Add User')}, + {'url': '/sys/users/edit', + 'text': _('Edit Users')}]} + sidebar_right = util.render_template(template='menu_block', + menu=menu) + return util.render_template(title="Manage Users and Groups", + sidebar_right=sidebar_right) + + +class UserAddForm(forms.Form): # pylint: disable-msg=W0232 + """Form to add a new user""" + + username = forms.CharField( + label=_('Username'), + help_text=_('Must be lower case alphanumeric and start with \ +and alphabet'), + validators=[ + validators.RegexValidator(r'^[a-z][a-z0-9]*$', + _('Invalid username'))]) + + password = forms.CharField(label=_('Password'), + widget=forms.PasswordInput()) + full_name = forms.CharField(label=_('Full name'), required=False) + email = forms.EmailField(label=_('Email'), required=False) + + +class UserAdd(PagePlugin): + """Add user page""" + order = 30 + + def __init__(self, *args, **kwargs): + PagePlugin.__init__(self, *args, **kwargs) + + self.register_page('sys.users.add') @cherrypy.expose @require() - def index(self): - sidebar_right = 'Add User
      Edit Users' - return self.fill_template(title="Manage Users and Groups", sidebar_right=sidebar_right) + def index(self, **kwargs): + """Serve the form""" + form = None + messages = [] -class add(FormPlugin, PagePlugin): - url = ["/sys/users/add"] - order = 30 - - sidebar_left = '' - sidebar_right = _("""Add User

      Adding a user via this - administrative interface might create a system user. - For example, if you provide a user with ssh access, she will - need a system account. If you don't know what that means, - don't worry about it.

      """) - - def main(self, username='', name='', email='', message=None, *args, **kwargs): - form = Form(title="Add User", - action=cfg.server_dir + "/sys/users/add/index", - name="add_user_form", - message=message) - form.text_input(_("Username"), name="username", value=username) - form.text_input(_("Full name"), name="name", value=name) - form.text_input(_("Email"), name="email", value=email) - form.text_input(_("Password"), name="password", type="password") - form.submit(label=_("Create User"), name="create") - return form.render() - - def process_form(self, username=None, name=None, email=None, password=None, **kwargs): - msg = Message() - - error = add_user(username, password, name, email, False) - if error: - msg.text = error + if kwargs: + form = UserAddForm(kwargs, prefix='user') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._add_user(form.cleaned_data, messages) + form = UserAddForm(prefix='user') else: - msg.add = _("%s saved." % username) + form = UserAddForm(prefix='user') - cfg.log(msg.text) - main = self.main(username, name, email, msg=msg.text) - return self.fill_template(title="Manage Users and Groups", main=main, sidebar_left=self.sidebar_left, sidebar_right=self.sidebar_right) + return util.render_template(template='users_add', title=_('Add User'), + form=form, messages=messages) -class edit(FormPlugin, PagePlugin): - url = ["/sys/users/edit"] - order = 35 + @staticmethod + def _add_user(data, messages): + """Add a user""" + if cfg.users.exists(data['username']): + messages.append( + ('error', _('User "{username}" already exists').format( + username=data['username']))) + return - sidebar_left = '' - sidebar_right = _("""Edit Users

      Click on a user's name to - go to a screen for editing that user's account.

      Delete - Users

      Check the box next to a users' names and then click - "Delete User" to remove users from %s and the %s - system.

      Deleting users is permanent!

      """ % (cfg.product_name, cfg.box_name)) + auth.add_user(data['username'], data['password'], data['full_name'], + data['email'], False) + messages.append( + ('success', _('User "{username}" added').format( + username=data['username']))) + + +class UserEditForm(forms.Form): # pylint: disable-msg=W0232 + """Form to edit/delete a user""" + def __init__(self, *args, **kwargs): + # pylint: disable-msg=E1002 + super(forms.Form, self).__init__(*args, **kwargs) - def main(self, msg=''): users = cfg.users.get_all() - add_form = Form(title=_("Edit or Delete User"), action=cfg.server_dir + "/sys/users/edit", message=msg) - add_form.html('Delete
      ') for uname in users: user = User(uname[1]) - add_form.html('  %s     ' % - add_form.get_checkbox(name=user['username']) + - '%s (%s)
      ' % - (user['username'], user['name'], user['username'])) - add_form.submit(label=_("Delete User"), name="delete") - return add_form.render() - def process_form(self, **kwargs): - if 'delete' in kwargs: - msg = Message() - usernames = find_keys(kwargs, 'on') - cfg.log.info("%s asked to delete %s" % (cherrypy.session.get(cfg.session_key), usernames)) - if usernames: - for username in usernames: - if cfg.users.exists(username): - try: - cfg.users.remove(username) - msg.add(_("Deleted user %s." % username)) - except IOError, e: - if cfg.users.exists(username): - m = _("Error on deletion, user %s not fully deleted: %s" % (username, e)) - cfg.log.error(m) - msg.add(m) - else: - m = _('Deletion failed on %s: %s' % (username, e)) - cfg.log.error(m) - msg.add(m) - else: - cfg.log.warning(_("Can't delete %s. User does not exist." % username)) - msg.add(_("User %s does not exist." % username)) - else: - msg.add = _("Must specify at least one valid, existing user.") - main = self.main(msg=msg.text) - return self.fill_template(title="Manage Users and Groups", main=main, sidebar_left=self.sidebar_left, sidebar_right=self.sidebar_right) + label = '%s (%s)' % (user['name'], user['username']) + field = forms.BooleanField(label=label, required=False) + # pylint: disable-msg=E1101 + self.fields['delete_user_' + user['username']] = field - sidebar_right = '' - u = cfg.users[kwargs['username']] - if not u: - main = _("

      Could not find a user with username of %s!

      " % kwargs['username']) - return self.fill_template(template="err", title=_("Unknown User"), main=main, - sidebar_left=self.sidebar_left, sidebar_right=sidebar_right) - main = _("""Edit User '%s'""" % u['username']) - sidebar_right = '' - return self.fill_template(title="Manage Users and Groups", main=main, sidebar_left=self.sidebar_left, sidebar_right=sidebar_right) +class UserEdit(PagePlugin): + """User edit page""" + order = 35 + + def __init__(self, *args, **kwargs): + PagePlugin.__init__(self, *args, **kwargs) + + self.register_page('sys.users.edit') + + @cherrypy.expose + @require() + def index(self, **kwargs): + """Serve the form""" + form = None + messages = [] + + if kwargs: + form = UserEditForm(kwargs, prefix='user') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(form.cleaned_data, messages) + form = UserEditForm(prefix='user') + else: + form = UserEditForm(prefix='user') + + return util.render_template(template='users_edit', + title=_('Edit or Delete User'), + form=form, messages=messages) + + @staticmethod + def _apply_changes(data, messages): + """Apply form changes""" + for field, value in data.items(): + if not value: + continue + + if not field.startswith('delete_user_'): + continue + + username = field.split('delete_user_')[1] + + cfg.log.info('%s asked to delete %s' % + (cherrypy.session.get(cfg.session_key), username)) + + if username == cfg.users.current(name=True): + messages.append( + ('error', + _('Can not delete current account - "%s"') % username)) + continue + + if not cfg.users.exists(username): + messages.append(('error', + _('User "%s" does not exist') % username)) + continue + + try: + cfg.users.remove(username) + messages.append(('success', _('User "%s" deleted') % username)) + except IOError as exception: + messages.append(('error', _('Error deleting "%s" - %s') % + (username, exception))) diff --git a/modules/installed/system/wan.py b/modules/installed/system/wan.py index 061ef50d1..962fe806f 100644 --- a/modules/installed/system/wan.py +++ b/modules/installed/system/wan.py @@ -1,78 +1,85 @@ -import os import cherrypy -try: - import simplejson as json -except ImportError: - import json +from django import forms from gettext import gettext as _ from modules.auth import require -from plugin_mount import PagePlugin, FormPlugin +from plugin_mount import PagePlugin import cfg -from forms import Form -from model import User -from util import * +import util -class wan(FormPlugin, PagePlugin): - url = ["/sys/config"] - order = 20 - def help(self, *args, **kwargs): - if not cfg.users.expert(): - return '' - return _(#"""

      Admin from WAN

      - """

      If you check this box, this front - end will be reachable from the WAN. If your %(box)s - connects you to the internet, that means you'll be able to log - in to the front end from the internet. This might be - convenient, but it is also dangerous, since it can - enable attackers to gain access to your %(box)s from the - outside world. All they'll need is your username and - passphrase, which they might guess or they might simply try - every posible combination of letters and numbers until they - get in. If you enable the WAN administration option, you - must use long and complex passphrases.

      +class WanForm(forms.Form): # pylint: disable-msg=W0232 + """Form to configure wan settings""" -

      For security reasons, neither WAN Administration nor WAN - SSH is available to the `admin` user account.

      + wan_admin = forms.BooleanField( + label=_('Allow access to Plinth from WAN'), + required=False, + help_text=_('If you check this box, this front end will be reachable \ +from the WAN. If your {{ box_name }} connects you to the internet, that \ +means you\'ll be able to log in to the front end from the internet. This \ +might be convenient, but it is also dangerous, since it can \ +enable attackers to gain access to your {{ box_name }} from the outside \ +world. All they\'ll need is your username and passphrase, which they might \ +guess or they might simply try every posible combination of letters and \ +numbers until they get in. If you enable the WAN administration option, you \ +must use long and complex passphrases.').format( + box_name=cfg.box_name)) -

      TODO: in expert mode, tell user they can ssh in to enable - admin from WAN, do their business, then disable it. It would - be good to enable the option and autodisable it when the ssh - connection dies.

      - """ % {'product':cfg.product_name, 'box':cfg.box_name}) + lan_ssh = forms.BooleanField( + label=_('Allow SSH access from LAN'), + required=False) - def main(self, message='', **kwargs): - store = filedict_con(cfg.store_file, 'sys') + wan_ssh = forms.BooleanField( + label=_('Allow SSH access from WAN'), + required=False) - defaults = {'wan_admin': '', - 'wan_ssh': '', - 'lan_ssh': '', - } - for key, value in defaults.items(): - if not key in kwargs: - try: - kwargs[key] = store[key] - except KeyError: - store[key] = kwargs[key] = value + # XXX: Only present due to issue with submitting empty form + dummy = forms.CharField(label='Dummy', initial='dummy', + widget=forms.HiddenInput()) - form = Form(title=_("Accessing the %s" % cfg.box_name), - action=cfg.server_dir + "/sys/config/wan/", - name="admin_wan_form", - message=message) - form.html(self.help()) - if cfg.users.expert(): - form.checkbox(_("Allow access to Plinth from WAN"), name="wan_admin", checked=kwargs['wan_admin']) - form.checkbox(_("Allow SSH access from LAN"), name="lan_ssh", checked=kwargs['lan_ssh']) - form.checkbox(_("Allow SSH access from WAN"), name="wan_ssh", checked=kwargs['wan_ssh']) - # Hidden field is needed because checkbox doesn't post if not checked - form.hidden(name="submitted", value="True") +class Wan(PagePlugin): + order = 60 - form.submit(_("Submit")) - return form.render() + def __init__(self, *args, **kwargs): + PagePlugin.__init__(self, *args, **kwargs) + self.register_page('sys.config.wan') - def process_form(self, wan_admin='', wan_ssh='', lan_ssh='', *args, **kwargs): - store = filedict_con(cfg.store_file, 'sys') + cfg.html_root.sys.config.menu.add_item(_('WAN'), 'icon-cog', + '/sys/config/wan', 20) + + @cherrypy.expose + @require() + def index(self, **kwargs): + """Serve the configuration form""" + status = self.get_status() + + form = None + messages = [] + + if kwargs and cfg.users.expert(): + form = WanForm(kwargs, prefix='wan') + # pylint: disable-msg=E1101 + if form.is_valid(): + self._apply_changes(form.cleaned_data, messages) + status = self.get_status() + form = WanForm(initial=status, prefix='wan') + else: + form = WanForm(initial=status, prefix='wan') + + title = _('Accessing the {box_name}').format(box_name=cfg.box_name) + return util.render_template(template='wan', title=title, form=form, + messages=messages) + + @staticmethod + def get_status(): + """Return the current status""" + return util.filedict_con(cfg.store_file, 'sys') + + @staticmethod + def _apply_changes(new_status, messages): + """Apply the changes after form submission""" + store = util.filedict_con(cfg.store_file, 'sys') for field in ['wan_admin', 'wan_ssh', 'lan_ssh']: - store[field] = locals()[field] - return "Settings updated." + store[field] = new_status[field] + + messages.append(('success', _('Setting updated'))) diff --git a/modules/installed/templates/firstboot_sidebar.html b/modules/installed/templates/firstboot_sidebar.html new file mode 100644 index 000000000..5b89b873e --- /dev/null +++ b/modules/installed/templates/firstboot_sidebar.html @@ -0,0 +1,28 @@ +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +
      + +

      Getting Help

      + +

      We've done our best to make your FreedomBox easy to use. If + you have questions during setup, there are a few places to turn + for help. TODO: add links to such help.

      + +
      diff --git a/modules/installed/templates/firstboot_state0.html b/modules/installed/templates/firstboot_state0.html new file mode 100644 index 000000000..656fe406f --- /dev/null +++ b/modules/installed/templates/firstboot_state0.html @@ -0,0 +1,57 @@ +{% extends "base.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + +

      Welcome to Your FreedomBox!

      + + {% include 'messages.html' %} + +

      Welcome. It looks like this FreedomBox isn't set up yet. We'll + need to ask you a just few questions to get started.

      + +
      + {% csrf_token %} + + {% include 'bootstrapform/field.html' with field=form.hostname %} + +

      Initial user and password. Access to this web + interface is protected by knowing a username and password. + Provide one here to register the initial privileged user. The + password can be changed and other users added later.

      + + {% include 'bootstrapform/field.html' with field=form.username %} + {% include 'bootstrapform/field.html' with field=form.password %} + + {% include 'bootstrapform/field.html' with field=form.box_key %} + + + +
      + +{% endblock %} + +{% block sidebar_right_block %} + + {% include "firstboot_sidebar.html" %} + +{% endblock %} diff --git a/modules/installed/templates/firstboot_state1.html b/modules/installed/templates/firstboot_state1.html new file mode 100644 index 000000000..5ea907ff9 --- /dev/null +++ b/modules/installed/templates/firstboot_state1.html @@ -0,0 +1,41 @@ +{% extends "base.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + +

      Welcome screen not completely implemented yet. Press continue to see the rest of the + web interface.

      + +
        +
      • TODO: explain all this cert stuff to the user.
        • +
      • TODO: add instrux for installing certificate.
        • +
      • TODO: add steps for after you have installed certificate.
        • +
      + +{% endblock %} + +{% block sidebar_right_block %} + + {% include "firstboot_sidebar.html" %} + +{% endblock %} diff --git a/plinth.py b/plinth.py index 2d10aa089..b5b5af526 100755 --- a/plinth.py +++ b/plinth.py @@ -3,6 +3,7 @@ import os, stat, sys, argparse from gettext import gettext as _ import cfg +import django.conf if not os.path.join(cfg.file_root, "vendor") in sys.path: sys.path.append(os.path.join(cfg.file_root, "vendor")) @@ -32,7 +33,7 @@ __status__ = "Development" import urlparse def error_page(status, dynamic_msg, stock_msg): - return u.page_template(template="err", title=status, main="

      %s

      %s" % (dynamic_msg, stock_msg)) + return u.render_template(template="err", title=status, main="

      %s

      %s" % (dynamic_msg, stock_msg)) def error_page_404(status, message, traceback, version): return error_page(status, message, """

      If you believe this @@ -88,6 +89,26 @@ def load_modules(): else: cfg.log("skipping %s" % name) + +def get_template_directories(): + """Return the list of template directories""" + directory = os.path.dirname(os.path.abspath(__file__)) + core_directory = os.path.join(directory, 'templates') + + directories = set((core_directory,)) + for name in os.listdir('modules'): + if not name.endswith(".py") or name.startswith('.'): + continue + + real_name = os.path.realpath(os.path.join('modules', name)) + directory = os.path.dirname(real_name) + directories.add(os.path.join(directory, 'templates')) + + cfg.log.info('Template directories - %s' % directories) + + return directories + + def parse_arguments(): parser = argparse.ArgumentParser(description='Plinth web interface for the FreedomBox.') parser.add_argument('--pidfile', @@ -146,7 +167,6 @@ def setup(): cfg.users = plugin_mount.UserStoreModule.get_plugins()[0] cfg.page_plugins = plugin_mount.PagePlugin.get_plugins() cfg.log("Loaded %d page plugins" % len(cfg.page_plugins)) - cfg.forms = plugin_mount.FormPlugin.get_plugins() # Add an extra server server = _cpserver.Server() @@ -178,13 +198,18 @@ def setup(): cherrypy.engine.signal_handler.subscribe() def main(): - # Initialize basic services - service.init() + # Initialize basic services + service.init() - setup() + setup() - cherrypy.engine.start() - cherrypy.engine.block() + # Configure Django + template_directories = get_template_directories() + django.conf.settings.configure(TEMPLATE_DIRS=template_directories, + INSTALLED_APPS=['bootstrapform']) + + cherrypy.engine.start() + cherrypy.engine.block() if __name__ == '__main__': main() diff --git a/plugin_mount.py b/plugin_mount.py index 69ff94552..e3ef5db41 100644 --- a/plugin_mount.py +++ b/plugin_mount.py @@ -1,8 +1,8 @@ import cherrypy from modules.auth import require import cfg -from util import * -import util as u +import util + class PluginMount(type): """See http://martyalchin.com/2008/jan/10/simple-plugin-framework/ for documentation""" @@ -34,27 +34,6 @@ class PluginMountSingular(PluginMount): cls.plugins.append(cls) -def get_parts(obj, parts=None, *args, **kwargs): - if parts == None: - parts={} - - fields = ['sidebar_left', 'sidebar_right', 'main', 'js', 'onload', 'nav', 'css', 'title'] - for v in fields: - if not v in parts: - parts[v] = '' - - try: - method = getattr(obj, v) - if callable(method): - parts[v] = method(*args, **kwargs) - else: - parts[v] = method - except AttributeError: - pass - - return parts - - def _setattr_deep(obj, path, value): """If path is 'x.y.z' or ['x', 'y', 'z'] then perform obj.x.y.z = value""" if isinstance(path, basestring): @@ -87,89 +66,6 @@ class PagePlugin: cfg.log.info("Registering page: %s" % url) _setattr_deep(cfg.html_root, url, self) - def fill_template(self, *args, **kwargs): - return u.page_template(*args, **kwargs) - - def forms(self, url, *args, **kwargs): - for form in cfg.forms: - if url in form.url: - cfg.log('Pulling together form for url %s (which matches %s)' % (url, form.url)) - - parts = get_parts(form, None, *args, **kwargs) - - return parts - return {'sidebar_left':left, 'sidebar_right':right, 'main':main} - -class FormPlugin(): - """ - Mount point for plugins that provide forms at specific URLs. - - Form plugin classes should also inherit from PagePlugin so they - can implement the page that handles the results of the form. The - name of the class will be appended to each url where the form is - displayed to get the urls of the results pages. - - Plugins implementing this reference should provide the following attributes: - - url - list of URL path strings of pages on which to display this - form, not including the url path that *only* displays this form - (that's handled by the index method) - - order - How high up on the page should this content be displayed? - Lower order is higher up. - - The following attributes are optional (though without at least one - of them, this plugin won't do much): - - sidebar_right - text to be displayed in the right column (can be attribute or method) (optional) - - sidebar_left - text to be displayed in the left column (can be attribute or method) (optional) - - main - text to be displayed in the center column (i.e. the form) (can be attribute or method) - - js - attribute containing a string that will be placed in the - template head, just below the javascript loads. Use it to load - more javascript files (optional) - - Although this plugin is intended for forms, it could just display - some html and skip the form. - """ - __metaclass__ = PluginMount - - order = 50 - url = [] - js = '' - - def __init__(self, *args, **kwargs): - for u in self.url: - path = u.split("/")[1:] + [self.__class__.__name__] - _setattr_deep(cfg.html_root, path, self) - cfg.log("Registered page: %s" % '.'.join(path)) - - def main(self, *args, **kwargs): - return "

      Override this method and replace it with a form.

      " - - @cherrypy.expose - @require() - def index(self, **kwargs): - """If the user has tried to fill in the form, process it, otherwise, just display a default form.""" - if kwargs: - kwargs['message'] = self.process_form(**kwargs) - parts = get_parts(self, **kwargs) - return self.fill_template(**parts) - - def process_form(self, **kwargs): - """Process the form. Return any message as a result of processing.""" - pass - - def fill_template(self, *args, **kwargs): - if not 'js' in kwargs: - try: - kwargs['js'] = self.js - except AttributeError: - pass - cfg.log("%%%%%%%%%%% %s" % kwargs) - return u.page_template(*args, **kwargs) class UserStoreModule: """ diff --git a/templates/Makefile b/templates/Makefile deleted file mode 100644 index df1b31f48..000000000 --- a/templates/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -CHEETAH=cheetah -TEMPLATES=$(wildcard *.tmpl) -TEMPLATE_PYFILES := $(patsubst %.tmpl,%.py,$(TEMPLATES)) - -## Catch-all tagets -default: $(TEMPLATE_PYFILES) - -%.py: %.tmpl - $(CHEETAH) c $< -templates: $(TEMPLATE_PYFILES) -template: templates - -clean: - rm -rf .\#* \#* *.pyc *.bak - @rm -f $(TEMPLATE_PYFILES) diff --git a/templates/__init__.py b/templates/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 000000000..ebaea525c --- /dev/null +++ b/templates/base.html @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + {% if title %} {{ title }} {% else %} FreedomBox Dashboard {% endif %} + + + + + + + + + + + + + + + + {{ css|safe }} + + + + +
      +
      +
      + + + + + + FreedomBoxFreedomBox Dashboard + {% block add_nav_and_login %} + {% endblock %} +
      +
      +
      + + +
      +
      + {% if submenu or sidebar_right or sidebar_left %} +
      + {% if submenu %} +
      + {% include "menu.html" with menu=submenu %} +
      + {% endif %} + {% if sidebar_left %} +
      + {{ sidebar_left|safe }} +
      + {% endif %} + {% block sidebar_right_block %} + {% if sidebar_right %} +
      + {{ sidebar_right|safe }} +
      + {% endif %} + {% endblock %} +
      + {% endif %} +
      +
      +

      + {% block title_block %} + {{ title }} + {% endblock %} +

      + {% block main_block %} + {{ main|safe }} + {% endblock %} +
      +
      +
      + +
      + + + +
      + + + + + + + + + + {% block js_block %} + {{ js|safe }} + {% endblock %} + + diff --git a/templates/base.tmpl b/templates/base.tmpl deleted file mode 100644 index ebfe48db6..000000000 --- a/templates/base.tmpl +++ /dev/null @@ -1,203 +0,0 @@ -#def default($text, $default) -#if $text - $text -#else - $default -#end if -#end def - - - - - - - - - - - - - - - - - - - - - - - - - $default($title, "FreedomBox Dashboard") - - - - - - - - - - - - - - - - - $css - - - - - $main_menu_js - $sub_menu_js - - - - -
      -
      -
      - - - - - - FreedomBoxFreedomBox Dashboard - #block add_nav_and_login - #end block add_nav_and_login -
      -
      -
      - - -
      -
      - #if $nav or $sidebar_right or $sidebar_left -
      - #if $nav -
      - $nav -
      - #end if - #if $sidebar_left -
      - left $sidebar_left -
      - #end if - #if $sidebar_right -
      - $sidebar_right -
      - #end if -
      - #end if -
      -
      -

      - #block title_block - $title - #end block title_block -

      - #block main_block - $main - #end block main_block -
      -
      -
      - -
      - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - $js - - diff --git a/templates/err.html b/templates/err.html new file mode 100644 index 000000000..5426f3659 --- /dev/null +++ b/templates/err.html @@ -0,0 +1,7 @@ +{% extends "login_nav.html" %} + +{% block title_block %} +Error: {{ title }} +
      +
      +{% endblock %} diff --git a/templates/err.tmpl b/templates/err.tmpl deleted file mode 100644 index 02106184b..000000000 --- a/templates/err.tmpl +++ /dev/null @@ -1,23 +0,0 @@ -#extends templates.login_nav - -#def title_block -Error: $title -
      -
      -#end def - -#def sidebar_left_block -$sidebar_left -#end def - -#def main_block -$main -#end def - -#def sidebar_right_block -$sidebar_right -#end def - -#def nav_block -$nav -#end def diff --git a/templates/form.html b/templates/form.html new file mode 100644 index 000000000..bfc33167b --- /dev/null +++ b/templates/form.html @@ -0,0 +1,37 @@ +{% extends "login_nav.html" %} +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% load bootstrap %} + +{% block main_block %} + + {% include 'messages.html' %} + +
      + {% csrf_token %} + + {{ form|bootstrap }} + + + +
      + +{% endblock %} diff --git a/templates/login_nav.html b/templates/login_nav.html new file mode 100644 index 000000000..dbb32f66a --- /dev/null +++ b/templates/login_nav.html @@ -0,0 +1,22 @@ +{% extends "base.html" %} + +{% block add_nav_and_login %} +
      + + + + {% if username %} +

      Logged in as {{ username }}. Log out.

      + {% else %} +

      Not logged in. Log in.

      + {% endif %} +{% endblock %} diff --git a/templates/login_nav.tmpl b/templates/login_nav.tmpl deleted file mode 100644 index 05780d05b..000000000 --- a/templates/login_nav.tmpl +++ /dev/null @@ -1,31 +0,0 @@ -#extends templates.base - -#def add_nav_and_login -
      - - #if $username -

      Logged in as $username. Log out.

      - #else -

      Not logged in. Log in.

      - #end if -#end def - -#def sidebar_left_block -$sidebar_left -#end def - -#def main_block -$main -#end def - -#def sidebar_right_block -$sidebar_right -#end def - -#def nav_block -$nav -#end def diff --git a/templates/menu.html b/templates/menu.html new file mode 100644 index 000000000..83374c40d --- /dev/null +++ b/templates/menu.html @@ -0,0 +1,36 @@ +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +
        +
      • Menu
        • + {% for item in menu.items %} + +
      • + + + {{ item.label }} + + {% if item.items %} + {% include "menu.html" with menu=item %} + {% endif %} +
        • + + {% endfor %} +
      diff --git a/templates/menu_block.html b/templates/menu_block.html new file mode 100644 index 000000000..05c9c0a5e --- /dev/null +++ b/templates/menu_block.html @@ -0,0 +1,8 @@ +
        +
      • {{ menu.title }}
        • + {% for item in menu.items %} +
      • + {{ item.text }} +
        • + {% endfor %} +
      diff --git a/templates/messages.html b/templates/messages.html new file mode 100644 index 000000000..fa5404495 --- /dev/null +++ b/templates/messages.html @@ -0,0 +1,25 @@ +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + +{% for severity, message in messages %} +
      + × + {{ message }} +
      +{% endfor %} diff --git a/templates/two_col.html b/templates/two_col.html new file mode 100644 index 000000000..ad8187349 --- /dev/null +++ b/templates/two_col.html @@ -0,0 +1,24 @@ +{{ extends "base.html" }} + +{% block css %} + + +{% endblock %} + +{% block add_sidebar_left %} +
      +
      + {% block nav_block %} + {{ nav }} + {% endblock %} + {% block sidebar_left_block %} + {{ sidebar_left }} + {% endblock %} +
      +
      + {% block sidebar_right_block %} + {{ sidebar_right }} + {% endblock %} +
      +
      +{% endblock %} diff --git a/templates/two_col.tmpl b/templates/two_col.tmpl deleted file mode 100644 index 3ba51b075..000000000 --- a/templates/two_col.tmpl +++ /dev/null @@ -1,25 +0,0 @@ -#extends templates.base - -#def css - - -#end def - -#def add_sidebar_left -
      -
      - #block nav_block - $nav - #end block nav_block - #block sidebar_left_block - $sidebar_left - #end block sidebar_left_block -
      -
      - #block sidebar_right_block - $sidebar_right - #end block sidebar_right_block -
      -
      -#end def - diff --git a/themes/default/css/bootstrap-responsive.css b/themes/default/css/bootstrap-responsive.css deleted file mode 100644 index d77d97d13..000000000 --- a/themes/default/css/bootstrap-responsive.css +++ /dev/null @@ -1,581 +0,0 @@ -/*! - * Bootstrap Responsive v2.0.1 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -.clearfix { - *zoom: 1; -} -.clearfix:before, .clearfix:after { - display: table; - content: ""; -} -.clearfix:after { - clear: both; -} -.hidden { - display: none; - visibility: hidden; -} -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 18px; - } - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 28px; - /* Make inputs at least the height of their button counterpart */ - - /* Makes inputs behave like true block-level elements */ - - -webkit-box-sizing: border-box; - /* Older Webkit */ - - -moz-box-sizing: border-box; - /* Older FF */ - - -ms-box-sizing: border-box; - /* IE8 */ - - box-sizing: border-box; - /* CSS3 spec*/ - - } - .input-prepend input[class*="span"], .input-append input[class*="span"] { - width: auto; - } - input[type="checkbox"], input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-left: 10px; - padding-right: 10px; - } - .modal { - position: absolute; - top: 10px; - left: 10px; - right: 10px; - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} -@media (max-width: 767px) { - .container { - width: auto; - padding: 0 20px; - } - .row-fluid { - width: 100%; - } - .row { - margin-left: 0; - } - .row > [class*="span"], .row-fluid > [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } -} -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, .row:after { - display: table; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - margin-left: 20px; - } - .span1 { - width: 42px; - } - .span2 { - width: 104px; - } - .span3 { - width: 166px; - } - .span4 { - width: 228px; - } - .span5 { - width: 290px; - } - .span6 { - width: 352px; - } - .span7 { - width: 414px; - } - .span8 { - width: 476px; - } - .span9 { - width: 538px; - } - .span10 { - width: 600px; - } - .span11 { - width: 662px; - } - .span12, .container { - width: 724px; - } - .offset1 { - margin-left: 82px; - } - .offset2 { - margin-left: 144px; - } - .offset3 { - margin-left: 206px; - } - .offset4 { - margin-left: 268px; - } - .offset5 { - margin-left: 330px; - } - .offset6 { - margin-left: 392px; - } - .offset7 { - margin-left: 454px; - } - .offset8 { - margin-left: 516px; - } - .offset9 { - margin-left: 578px; - } - .offset10 { - margin-left: 640px; - } - .offset11 { - margin-left: 702px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, .row-fluid:after { - display: table; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid > [class*="span"] { - float: left; - margin-left: 2.762430939%; - } - .row-fluid > [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid > .span1 { - width: 5.801104972%; - } - .row-fluid > .span2 { - width: 14.364640883%; - } - .row-fluid > .span3 { - width: 22.928176794%; - } - .row-fluid > .span4 { - width: 31.491712705%; - } - .row-fluid > .span5 { - width: 40.055248616%; - } - .row-fluid > .span6 { - width: 48.618784527%; - } - .row-fluid > .span7 { - width: 57.182320438000005%; - } - .row-fluid > .span8 { - width: 65.74585634900001%; - } - .row-fluid > .span9 { - width: 74.30939226%; - } - .row-fluid > .span10 { - width: 82.87292817100001%; - } - .row-fluid > .span11 { - width: 91.436464082%; - } - .row-fluid > .span12 { - width: 99.999999993%; - } - input.span1, textarea.span1, .uneditable-input.span1 { - width: 32px; - } - input.span2, textarea.span2, .uneditable-input.span2 { - width: 94px; - } - input.span3, textarea.span3, .uneditable-input.span3 { - width: 156px; - } - input.span4, textarea.span4, .uneditable-input.span4 { - width: 218px; - } - input.span5, textarea.span5, .uneditable-input.span5 { - width: 280px; - } - input.span6, textarea.span6, .uneditable-input.span6 { - width: 342px; - } - input.span7, textarea.span7, .uneditable-input.span7 { - width: 404px; - } - input.span8, textarea.span8, .uneditable-input.span8 { - width: 466px; - } - input.span9, textarea.span9, .uneditable-input.span9 { - width: 528px; - } - input.span10, textarea.span10, .uneditable-input.span10 { - width: 590px; - } - input.span11, textarea.span11, .uneditable-input.span11 { - width: 652px; - } - input.span12, textarea.span12, .uneditable-input.span12 { - width: 714px; - } -} -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top { - position: static; - margin-bottom: 18px; - } - .navbar-fixed-top .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-left: 10px; - padding-right: 10px; - margin: 0 0 0 -5px; - } - .navbar .nav-collapse { - clear: left; - } - .navbar .nav { - float: none; - margin: 0 0 9px; - } - .navbar .nav > li { - float: none; - } - .navbar .nav > li > a { - margin-bottom: 2px; - } - .navbar .nav > .divider-vertical { - display: none; - } - .navbar .nav .nav-header { - color: #999999; - text-shadow: none; - } - .navbar .nav > li > a, .navbar .dropdown-menu a { - padding: 6px 15px; - font-weight: bold; - color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .navbar .dropdown-menu li + li a { - margin-bottom: 2px; - } - .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover { - background-color: #222222; - } - .navbar .dropdown-menu { - position: static; - top: auto; - left: auto; - float: none; - display: block; - max-width: none; - margin: 0 15px; - padding: 0; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .navbar .dropdown-menu:before, .navbar .dropdown-menu:after { - display: none; - } - .navbar .dropdown-menu .divider { - display: none; - } - .navbar-form, .navbar-search { - float: none; - padding: 9px 15px; - margin: 9px 0; - border-top: 1px solid #222222; - border-bottom: 1px solid #222222; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar .nav.pull-right { - float: none; - margin-left: 0; - } - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - .btn-navbar { - display: block; - } - .nav-collapse { - overflow: hidden; - height: 0; - } -} -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - } -} -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, .row:after { - display: table; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - margin-left: 30px; - } - .span1 { - width: 70px; - } - .span2 { - width: 170px; - } - .span3 { - width: 270px; - } - .span4 { - width: 370px; - } - .span5 { - width: 470px; - } - .span6 { - width: 570px; - } - .span7 { - width: 670px; - } - .span8 { - width: 770px; - } - .span9 { - width: 870px; - } - .span10 { - width: 970px; - } - .span11 { - width: 1070px; - } - .span12, .container { - width: 1170px; - } - .offset1 { - margin-left: 130px; - } - .offset2 { - margin-left: 230px; - } - .offset3 { - margin-left: 330px; - } - .offset4 { - margin-left: 430px; - } - .offset5 { - margin-left: 530px; - } - .offset6 { - margin-left: 630px; - } - .offset7 { - margin-left: 730px; - } - .offset8 { - margin-left: 830px; - } - .offset9 { - margin-left: 930px; - } - .offset10 { - margin-left: 1030px; - } - .offset11 { - margin-left: 1130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, .row-fluid:after { - display: table; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid > [class*="span"] { - float: left; - margin-left: 2.564102564%; - } - .row-fluid > [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid > .span1 { - width: 5.982905983%; - } - .row-fluid > .span2 { - width: 14.529914530000001%; - } - .row-fluid > .span3 { - width: 23.076923077%; - } - .row-fluid > .span4 { - width: 31.623931624%; - } - .row-fluid > .span5 { - width: 40.170940171000005%; - } - .row-fluid > .span6 { - width: 48.717948718%; - } - .row-fluid > .span7 { - width: 57.264957265%; - } - .row-fluid > .span8 { - width: 65.81196581200001%; - } - .row-fluid > .span9 { - width: 74.358974359%; - } - .row-fluid > .span10 { - width: 82.905982906%; - } - .row-fluid > .span11 { - width: 91.45299145300001%; - } - .row-fluid > .span12 { - width: 100%; - } - input.span1, textarea.span1, .uneditable-input.span1 { - width: 60px; - } - input.span2, textarea.span2, .uneditable-input.span2 { - width: 160px; - } - input.span3, textarea.span3, .uneditable-input.span3 { - width: 260px; - } - input.span4, textarea.span4, .uneditable-input.span4 { - width: 360px; - } - input.span5, textarea.span5, .uneditable-input.span5 { - width: 460px; - } - input.span6, textarea.span6, .uneditable-input.span6 { - width: 560px; - } - input.span7, textarea.span7, .uneditable-input.span7 { - width: 660px; - } - input.span8, textarea.span8, .uneditable-input.span8 { - width: 760px; - } - input.span9, textarea.span9, .uneditable-input.span9 { - width: 860px; - } - input.span10, textarea.span10, .uneditable-input.span10 { - width: 960px; - } - input.span11, textarea.span11, .uneditable-input.span11 { - width: 1060px; - } - input.span12, textarea.span12, .uneditable-input.span12 { - width: 1160px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } -} diff --git a/themes/default/css/bootstrap-responsive.min.css b/themes/default/css/bootstrap-responsive.min.css new file mode 120000 index 000000000..129a42888 --- /dev/null +++ b/themes/default/css/bootstrap-responsive.min.css @@ -0,0 +1 @@ +/usr/share/twitter-bootstrap/files/css/bootstrap-responsive.min.css \ No newline at end of file diff --git a/themes/default/css/bootstrap.css b/themes/default/css/bootstrap.css deleted file mode 100644 index e1d175d79..000000000 --- a/themes/default/css/bootstrap.css +++ /dev/null @@ -1,3504 +0,0 @@ -/*! - * Bootstrap v2.0.1 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} -audio, canvas, video { - display: inline-block; - *display: inline; - *zoom: 1; -} -audio:not([controls]) { - display: none; -} -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -a:hover, a:active { - outline: 0; -} -sub, sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} -img { - max-width: 100%; - height: auto; - border: 0; - -ms-interpolation-mode: bicubic; -} -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, input { - *overflow: visible; - line-height: normal; -} -button::-moz-focus-inner, input::-moz-focus-inner { - padding: 0; - border: 0; -} -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} -input[type="search"] { - -webkit-appearance: textfield; - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} -textarea { - overflow: auto; - vertical-align: top; -} -.clearfix { - *zoom: 1; -} -.clearfix:before, .clearfix:after { - display: table; - content: ""; -} -.clearfix:after { - clear: both; -} -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #333333; - background-color: #ffffff; -} -a { - color: #0088cc; - text-decoration: none; -} -a:hover { - color: #005580; - text-decoration: underline; -} -.row { - margin-left: -20px; - *zoom: 1; -} -.row:before, .row:after { - display: table; - content: ""; -} -.row:after { - clear: both; -} -[class*="span"] { - float: left; - margin-left: 20px; -} -.span1 { - width: 60px; -} -.span2 { - width: 140px; -} -.span3 { - width: 220px; -} -.span4 { - width: 300px; -} -.span5 { - width: 380px; -} -.span6 { - width: 460px; -} -.span7 { - width: 540px; -} -.span8 { - width: 620px; -} -.span9 { - width: 700px; -} -.span10 { - width: 780px; -} -.span11 { - width: 860px; -} -.span12, .container { - width: 940px; -} -.offset1 { - margin-left: 100px; -} -.offset2 { - margin-left: 180px; -} -.offset3 { - margin-left: 260px; -} -.offset4 { - margin-left: 340px; -} -.offset5 { - margin-left: 420px; -} -.offset6 { - margin-left: 500px; -} -.offset7 { - margin-left: 580px; -} -.offset8 { - margin-left: 660px; -} -.offset9 { - margin-left: 740px; -} -.offset10 { - margin-left: 820px; -} -.offset11 { - margin-left: 900px; -} -.row-fluid { - width: 100%; - *zoom: 1; -} -.row-fluid:before, .row-fluid:after { - display: table; - content: ""; -} -.row-fluid:after { - clear: both; -} -.row-fluid > [class*="span"] { - float: left; - margin-left: 2.127659574%; -} -.row-fluid > [class*="span"]:first-child { - margin-left: 0; -} -.row-fluid > .span1 { - width: 6.382978723%; -} -.row-fluid > .span2 { - width: 14.89361702%; -} -.row-fluid > .span3 { - width: 23.404255317%; -} -.row-fluid > .span4 { - width: 31.914893614%; -} -.row-fluid > .span5 { - width: 40.425531911%; -} -.row-fluid > .span6 { - width: 48.93617020799999%; -} -.row-fluid > .span7 { - width: 57.446808505%; -} -.row-fluid > .span8 { - width: 65.95744680199999%; -} -.row-fluid > .span9 { - width: 74.468085099%; -} -.row-fluid > .span10 { - width: 82.97872339599999%; -} -.row-fluid > .span11 { - width: 91.489361693%; -} -.row-fluid > .span12 { - width: 99.99999998999999%; -} -.container { - width: 940px; - margin-left: auto; - margin-right: auto; - *zoom: 1; -} -.container:before, .container:after { - display: table; - content: ""; -} -.container:after { - clear: both; -} -.container-fluid { - padding-left: 20px; - padding-right: 20px; - *zoom: 1; -} -.container-fluid:before, .container-fluid:after { - display: table; - content: ""; -} -.container-fluid:after { - clear: both; -} -p { - margin: 0 0 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; -} -.lead { - margin-bottom: 18px; - font-size: 20px; - font-weight: 200; - line-height: 27px; -} -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-weight: bold; - color: #333333; - text-rendering: optimizelegibility; -} -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} -h1 { - font-size: 30px; - line-height: 36px; -} -h1 small { - font-size: 18px; -} -h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; -} -h3 { - line-height: 27px; - font-size: 18px; -} -h3 small { - font-size: 14px; -} -h4, h5, h6 { - line-height: 18px; -} -h4 { - font-size: 14px; -} -h4 small { - font-size: 12px; -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} -.page-header { - padding-bottom: 17px; - margin: 18px 0; - border-bottom: 1px solid #eeeeee; -} -.page-header h1 { - line-height: 1; -} -ul, ol { - padding: 0; - margin: 0 0 9px 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -ul { - list-style: disc; -} -ol { - list-style: decimal; -} -li { - line-height: 18px; -} -ul.unstyled, ol.unstyled { - margin-left: 0; - list-style: none; -} -dl { - margin-bottom: 18px; -} -dt, dd { - line-height: 18px; -} -dt { - font-weight: bold; -} -dd { - margin-left: 9px; -} -hr { - margin: 18px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr { - font-size: 90%; - text-transform: uppercase; - border-bottom: 1px dotted #ddd; - cursor: help; -} -blockquote { - padding: 0 0 0 15px; - margin: 0 0 18px; - border-left: 5px solid #eeeeee; -} -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 22.5px; -} -blockquote small { - display: block; - line-height: 18px; - color: #999999; -} -blockquote small:before { - content: '\2014 \00A0'; -} -blockquote.pull-right { - float: right; - padding-left: 0; - padding-right: 15px; - border-left: 0; - border-right: 5px solid #eeeeee; -} -blockquote.pull-right p, blockquote.pull-right small { - text-align: right; -} -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} -address { - display: block; - margin-bottom: 18px; - line-height: 18px; - font-style: normal; -} -small { - font-size: 100%; -} -cite { - font-style: normal; -} -code, pre { - padding: 0 3px 2px; - font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -code { - padding: 3px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} -pre { - display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12px; - line-height: 18px; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - white-space: pre; - white-space: pre-wrap; - word-break: break-all; - word-wrap: break-word; -} -pre.prettyprint { - margin-bottom: 18px; -} -pre code { - padding: 0; - color: inherit; - background-color: transparent; - border: 0; -} -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} -form { - margin: 0 0 18px; -} -fieldset { - padding: 0; - margin: 0; - border: 0; -} -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; - color: #333333; - border: 0; - border-bottom: 1px solid #eee; -} -legend small { - font-size: 13.5px; - color: #999999; -} -label, -input, -button, -select, -textarea { - font-size: 13px; - font-weight: normal; - line-height: 18px; -} -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} -label { - display: block; - margin-bottom: 5px; - color: #333333; -} -input, -textarea, -select, -.uneditable-input { - display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; - color: #555555; - border: 1px solid #ccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.uneditable-textarea { - width: auto; - height: auto; -} -label input, label textarea, label select { - display: block; -} -input[type="image"], input[type="checkbox"], input[type="radio"] { - width: auto; - height: auto; - padding: 0; - margin: 3px 0; - *margin-top: 0; - /* IE7 */ - - line-height: normal; - cursor: pointer; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0 \9; - /* IE9 and down */ - -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - border: initial; - background-color: #ffffff; - background-color: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -input[type="button"], input[type="reset"], input[type="submit"] { - width: auto; - height: auto; -} -select, input[type="file"] { - height: 28px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; -} -select { - width: 220px; - background-color: #ffffff; -} -select[multiple], select[size] { - height: auto; -} -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -textarea { - height: auto; -} -input[type="hidden"] { - display: none; -} -.radio, .checkbox { - padding-left: 18px; -} -.radio input[type="radio"], .checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} -.controls > .radio:first-child, .controls > .checkbox:first-child { - padding-top: 5px; -} -.radio.inline, .checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} -.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { - margin-left: 10px; -} -input, textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.input-mini { - width: 60px; -} -.input-small { - width: 90px; -} -.input-medium { - width: 150px; -} -.input-large { - width: 210px; -} -.input-xlarge { - width: 270px; -} -.input-xxlarge { - width: 530px; -} -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input { - float: none; - margin-left: 0; -} -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; -} -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; -} -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; -} -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; -} -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - background-color: #f5f5f5; - border-color: #ddd; - cursor: not-allowed; -} -.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { - color: #c09853; -} -.control-group.warning input, .control-group.warning select, .control-group.warning textarea { - color: #c09853; - border-color: #c09853; -} -.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; -} -.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} -.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { - color: #b94a48; -} -.control-group.error input, .control-group.error select, .control-group.error textarea { - color: #b94a48; - border-color: #b94a48; -} -.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; - box-shadow: 0 0 6px #d59392; -} -.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} -.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { - color: #468847; -} -.control-group.success input, .control-group.success select, .control-group.success textarea { - color: #468847; - border-color: #468847; -} -.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; -} -.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} -input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; -} -input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} -.form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; - background-color: #f5f5f5; - border-top: 1px solid #ddd; -} -.uneditable-input { - display: block; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - cursor: not-allowed; -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} -.help-block { - display: block; - margin-top: 5px; - margin-bottom: 0; - color: #999999; -} -.help-inline { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-bottom: 9px; - vertical-align: middle; - padding-left: 5px; -} -.input-prepend, .input-append { - margin-bottom: 5px; - *zoom: 1; -} -.input-prepend:before, -.input-append:before, -.input-prepend:after, -.input-append:after { - display: table; - content: ""; -} -.input-prepend:after, .input-append:after { - clear: both; -} -.input-prepend input, -.input-append input, -.input-prepend .uneditable-input, -.input-append .uneditable-input { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-prepend input:focus, -.input-append input:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { - position: relative; - z-index: 2; -} -.input-prepend .uneditable-input, .input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, .input-append .add-on { - float: left; - display: block; - width: auto; - min-width: 16px; - height: 18px; - margin-right: -1px; - padding: 4px 5px; - font-weight: normal; - line-height: 18px; - color: #999999; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #f5f5f5; - border: 1px solid #ccc; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-prepend .active, .input-append .active { - background-color: #a9dba9; - border-color: #46a546; -} -.input-prepend .add-on { - *margin-top: 1px; - /* IE6-7 */ - -} -.input-append input, .input-append .uneditable-input { - float: left; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-append .uneditable-input { - border-left-color: #eee; - border-right-color: #ccc; -} -.input-append .add-on { - margin-right: 0; - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-append input:first-child { - *margin-left: -160px; -} -.input-append input:first-child + .add-on { - *margin-left: -21px; -} -.search-query { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; -} -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input { - display: inline-block; - margin-bottom: 0; -} -.form-search .hide, .form-inline .hide, .form-horizontal .hide { - display: none; -} -.form-search label, -.form-inline label, -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - display: inline-block; -} -.form-search .input-append .add-on, -.form-inline .input-prepend .add-on, -.form-search .input-append .add-on, -.form-inline .input-prepend .add-on { - vertical-align: middle; -} -.form-search .radio, -.form-inline .radio, -.form-search .checkbox, -.form-inline .checkbox { - margin-bottom: 0; - vertical-align: middle; -} -.control-group { - margin-bottom: 9px; -} -legend + .control-group { - margin-top: 18px; - -webkit-margin-top-collapse: separate; -} -.form-horizontal .control-group { - margin-bottom: 18px; - *zoom: 1; -} -.form-horizontal .control-group:before, .form-horizontal .control-group:after { - display: table; - content: ""; -} -.form-horizontal .control-group:after { - clear: both; -} -.form-horizontal .control-label { - float: left; - width: 140px; - padding-top: 5px; - text-align: right; -} -.form-horizontal .controls { - margin-left: 160px; -} -.form-horizontal .form-actions { - padding-left: 160px; -} -table { - max-width: 100%; - border-collapse: collapse; - border-spacing: 0; -} -.table { - width: 100%; - margin-bottom: 18px; -} -.table th, .table td { - padding: 8px; - line-height: 18px; - text-align: left; - vertical-align: top; - border-top: 1px solid #ddd; -} -.table th { - font-weight: bold; -} -.table thead th { - vertical-align: bottom; -} -.table thead:first-child tr th, .table thead:first-child tr td { - border-top: 0; -} -.table tbody + tbody { - border-top: 2px solid #ddd; -} -.table-condensed th, .table-condensed td { - padding: 4px 5px; -} -.table-bordered { - border: 1px solid #ddd; - border-collapse: separate; - *border-collapse: collapsed; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.table-bordered th + th, -.table-bordered td + td, -.table-bordered th + td, -.table-bordered td + th { - border-left: 1px solid #ddd; -} -.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} -.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-radius: 4px 0 0 0; - -moz-border-radius: 4px 0 0 0; - border-radius: 4px 0 0 0; -} -.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-radius: 0 4px 0 0; - -moz-border-radius: 0 4px 0 0; - border-radius: 0 4px 0 0; -} -.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; -} -.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; -} -.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { - background-color: #f9f9f9; -} -.table tbody tr:hover td, .table tbody tr:hover th { - background-color: #f5f5f5; -} -table .span1 { - float: none; - width: 44px; - margin-left: 0; -} -table .span2 { - float: none; - width: 124px; - margin-left: 0; -} -table .span3 { - float: none; - width: 204px; - margin-left: 0; -} -table .span4 { - float: none; - width: 284px; - margin-left: 0; -} -table .span5 { - float: none; - width: 364px; - margin-left: 0; -} -table .span6 { - float: none; - width: 444px; - margin-left: 0; -} -table .span7 { - float: none; - width: 524px; - margin-left: 0; -} -table .span8 { - float: none; - width: 604px; - margin-left: 0; -} -table .span9 { - float: none; - width: 684px; - margin-left: 0; -} -table .span10 { - float: none; - width: 764px; - margin-left: 0; -} -table .span11 { - float: none; - width: 844px; - margin-left: 0; -} -table .span12 { - float: none; - width: 924px; - margin-left: 0; -} -[class^="icon-"], [class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; - *margin-right: .3em; -} -[class^="icon-"]:last-child, [class*=" icon-"]:last-child { - *margin-left: 0; -} -.icon-white { - background-image: url("../img/glyphicons-halflings-white.png"); -} -.icon-glass { - background-position: 0 0; -} -.icon-music { - background-position: -24px 0; -} -.icon-search { - background-position: -48px 0; -} -.icon-envelope { - background-position: -72px 0; -} -.icon-heart { - background-position: -96px 0; -} -.icon-star { - background-position: -120px 0; -} -.icon-star-empty { - background-position: -144px 0; -} -.icon-user { - background-position: -168px 0; -} -.icon-film { - background-position: -192px 0; -} -.icon-th-large { - background-position: -216px 0; -} -.icon-th { - background-position: -240px 0; -} -.icon-th-list { - background-position: -264px 0; -} -.icon-ok { - background-position: -288px 0; -} -.icon-remove { - background-position: -312px 0; -} -.icon-zoom-in { - background-position: -336px 0; -} -.icon-zoom-out { - background-position: -360px 0; -} -.icon-off { - background-position: -384px 0; -} -.icon-signal { - background-position: -408px 0; -} -.icon-cog { - background-position: -432px 0; -} -.icon-trash { - background-position: -456px 0; -} -.icon-home { - background-position: 0 -24px; -} -.icon-file { - background-position: -24px -24px; -} -.icon-time { - background-position: -48px -24px; -} -.icon-road { - background-position: -72px -24px; -} -.icon-download-alt { - background-position: -96px -24px; -} -.icon-download { - background-position: -120px -24px; -} -.icon-upload { - background-position: -144px -24px; -} -.icon-inbox { - background-position: -168px -24px; -} -.icon-play-circle { - background-position: -192px -24px; -} -.icon-repeat { - background-position: -216px -24px; -} -.icon-refresh { - background-position: -240px -24px; -} -.icon-list-alt { - background-position: -264px -24px; -} -.icon-lock { - background-position: -287px -24px; -} -.icon-flag { - background-position: -312px -24px; -} -.icon-headphones { - background-position: -336px -24px; -} -.icon-volume-off { - background-position: -360px -24px; -} -.icon-volume-down { - background-position: -384px -24px; -} -.icon-volume-up { - background-position: -408px -24px; -} -.icon-qrcode { - background-position: -432px -24px; -} -.icon-barcode { - background-position: -456px -24px; -} -.icon-tag { - background-position: 0 -48px; -} -.icon-tags { - background-position: -25px -48px; -} -.icon-book { - background-position: -48px -48px; -} -.icon-bookmark { - background-position: -72px -48px; -} -.icon-print { - background-position: -96px -48px; -} -.icon-camera { - background-position: -120px -48px; -} -.icon-font { - background-position: -144px -48px; -} -.icon-bold { - background-position: -167px -48px; -} -.icon-italic { - background-position: -192px -48px; -} -.icon-text-height { - background-position: -216px -48px; -} -.icon-text-width { - background-position: -240px -48px; -} -.icon-align-left { - background-position: -264px -48px; -} -.icon-align-center { - background-position: -288px -48px; -} -.icon-align-right { - background-position: -312px -48px; -} -.icon-align-justify { - background-position: -336px -48px; -} -.icon-list { - background-position: -360px -48px; -} -.icon-indent-left { - background-position: -384px -48px; -} -.icon-indent-right { - background-position: -408px -48px; -} -.icon-facetime-video { - background-position: -432px -48px; -} -.icon-picture { - background-position: -456px -48px; -} -.icon-pencil { - background-position: 0 -72px; -} -.icon-map-marker { - background-position: -24px -72px; -} -.icon-adjust { - background-position: -48px -72px; -} -.icon-tint { - background-position: -72px -72px; -} -.icon-edit { - background-position: -96px -72px; -} -.icon-share { - background-position: -120px -72px; -} -.icon-check { - background-position: -144px -72px; -} -.icon-move { - background-position: -168px -72px; -} -.icon-step-backward { - background-position: -192px -72px; -} -.icon-fast-backward { - background-position: -216px -72px; -} -.icon-backward { - background-position: -240px -72px; -} -.icon-play { - background-position: -264px -72px; -} -.icon-pause { - background-position: -288px -72px; -} -.icon-stop { - background-position: -312px -72px; -} -.icon-forward { - background-position: -336px -72px; -} -.icon-fast-forward { - background-position: -360px -72px; -} -.icon-step-forward { - background-position: -384px -72px; -} -.icon-eject { - background-position: -408px -72px; -} -.icon-chevron-left { - background-position: -432px -72px; -} -.icon-chevron-right { - background-position: -456px -72px; -} -.icon-plus-sign { - background-position: 0 -96px; -} -.icon-minus-sign { - background-position: -24px -96px; -} -.icon-remove-sign { - background-position: -48px -96px; -} -.icon-ok-sign { - background-position: -72px -96px; -} -.icon-question-sign { - background-position: -96px -96px; -} -.icon-info-sign { - background-position: -120px -96px; -} -.icon-screenshot { - background-position: -144px -96px; -} -.icon-remove-circle { - background-position: -168px -96px; -} -.icon-ok-circle { - background-position: -192px -96px; -} -.icon-ban-circle { - background-position: -216px -96px; -} -.icon-arrow-left { - background-position: -240px -96px; -} -.icon-arrow-right { - background-position: -264px -96px; -} -.icon-arrow-up { - background-position: -289px -96px; -} -.icon-arrow-down { - background-position: -312px -96px; -} -.icon-share-alt { - background-position: -336px -96px; -} -.icon-resize-full { - background-position: -360px -96px; -} -.icon-resize-small { - background-position: -384px -96px; -} -.icon-plus { - background-position: -408px -96px; -} -.icon-minus { - background-position: -433px -96px; -} -.icon-asterisk { - background-position: -456px -96px; -} -.icon-exclamation-sign { - background-position: 0 -120px; -} -.icon-gift { - background-position: -24px -120px; -} -.icon-leaf { - background-position: -48px -120px; -} -.icon-fire { - background-position: -72px -120px; -} -.icon-eye-open { - background-position: -96px -120px; -} -.icon-eye-close { - background-position: -120px -120px; -} -.icon-warning-sign { - background-position: -144px -120px; -} -.icon-plane { - background-position: -168px -120px; -} -.icon-calendar { - background-position: -192px -120px; -} -.icon-random { - background-position: -216px -120px; -} -.icon-comment { - background-position: -240px -120px; -} -.icon-magnet { - background-position: -264px -120px; -} -.icon-chevron-up { - background-position: -288px -120px; -} -.icon-chevron-down { - background-position: -313px -119px; -} -.icon-retweet { - background-position: -336px -120px; -} -.icon-shopping-cart { - background-position: -360px -120px; -} -.icon-folder-close { - background-position: -384px -120px; -} -.icon-folder-open { - background-position: -408px -120px; -} -.icon-resize-vertical { - background-position: -432px -119px; -} -.icon-resize-horizontal { - background-position: -456px -118px; -} -.dropdown { - position: relative; -} -.dropdown-toggle { - *margin-bottom: -3px; -} -.dropdown-toggle:active, .open .dropdown-toggle { - outline: 0; -} -.caret { - display: inline-block; - width: 0; - height: 0; - text-indent: -99999px; - *text-indent: 0; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000000; - opacity: 0.3; - filter: alpha(opacity=30); - content: "\2193"; -} -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} -.dropdown:hover .caret, .open.dropdown .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - float: left; - display: none; - min-width: 160px; - _width: 160px; - padding: 4px 0; - margin: 0; - list-style: none; - background-color: #ffffff; - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 1px; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - *border-right-width: 2px; - *border-bottom-width: 2px; -} -.dropdown-menu.bottom-up { - top: auto; - bottom: 100%; - margin-bottom: 2px; -} -.dropdown-menu .divider { - height: 1px; - margin: 5px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; - *width: 100%; - *margin: -5px 0 5px; -} -.dropdown-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #555555; - white-space: nowrap; -} -.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0088cc; -} -.dropdown.open { - *z-index: 1000; -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { - display: block; -} -.typeahead { - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} -.fade { - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; - opacity: 0; -} -.fade.in { - opacity: 1; -} -.collapse { - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; - position: relative; - overflow: hidden; - height: 0; -} -.collapse.in { - height: auto; -} -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 18px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} -.close:hover { - color: #000000; - text-decoration: none; - opacity: 0.4; - filter: alpha(opacity=40); - cursor: pointer; -} -.btn { - display: inline-block; - padding: 4px 10px 4px; - margin-bottom: 0; - font-size: 13px; - line-height: 18px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - background-color: #f5f5f5; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(top, #ffffff, #e6e6e6); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - cursor: pointer; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - *margin-left: .3em; -} -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - background-color: #e6e6e6; -} -.btn:active, .btn.active { - background-color: #cccccc \9; -} -.btn:first-child { - *margin-left: 0; -} -.btn:hover { - color: #333333; - text-decoration: none; - background-color: #e6e6e6; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.btn.active, .btn:active { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - background-color: #e6e6e6; - background-color: #d9d9d9 \9; - outline: 0; -} -.btn.disabled, .btn[disabled] { - cursor: default; - background-image: none; - background-color: #e6e6e6; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-large [class^="icon-"] { - margin-top: 1px; -} -.btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; -} -.btn-small [class^="icon-"] { - margin-top: -1px; -} -.btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; -} -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - color: #ffffff; -} -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-dark.active { - color: rgba(255, 255, 255, 0.75); -} -.btn-primary { - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -ms-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - background-color: #0044cc; -} -.btn-primary:active, .btn-primary.active { - background-color: #003399 \9; -} -.btn-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - background-color: #f89406; -} -.btn-warning:active, .btn-warning.active { - background-color: #c67605 \9; -} -.btn-danger { - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - background-color: #bd362f; -} -.btn-danger:active, .btn-danger.active { - background-color: #942a25 \9; -} -.btn-success { - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - background-color: #51a351; -} -.btn-success:active, .btn-success.active { - background-color: #408140 \9; -} -.btn-info { - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - background-color: #2f96b4; -} -.btn-info:active, .btn-info.active { - background-color: #24748c \9; -} -.btn-inverse { - background-color: #393939; - background-image: -moz-linear-gradient(top, #454545, #262626); - background-image: -ms-linear-gradient(top, #454545, #262626); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626)); - background-image: -webkit-linear-gradient(top, #454545, #262626); - background-image: -o-linear-gradient(top, #454545, #262626); - background-image: linear-gradient(top, #454545, #262626); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0); - border-color: #262626 #262626 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - background-color: #262626; -} -.btn-inverse:active, .btn-inverse.active { - background-color: #0c0c0c \9; -} -button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; -} -button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} -button.btn.large, input[type="submit"].btn.large { - *padding-top: 7px; - *padding-bottom: 7px; -} -button.btn.small, input[type="submit"].btn.small { - *padding-top: 3px; - *padding-bottom: 3px; -} -.btn-group { - position: relative; - *zoom: 1; - *margin-left: .3em; -} -.btn-group:before, .btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} -.btn-group:first-child { - *margin-left: 0; -} -.btn-group + .btn-group { - margin-left: 5px; -} -.btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; -} -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} -.btn-group .btn { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.btn-group .btn:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; -} -.btn-group .btn:last-child, .btn-group .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; -} -.btn-group .btn.large:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; -} -.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; -} -.btn-group .btn:hover, -.btn-group .btn:focus, -.btn-group .btn:active, -.btn-group .btn.active { - z-index: 2; -} -.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { - outline: 0; -} -.btn-group .dropdown-toggle { - padding-left: 8px; - padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - *padding-top: 5px; - *padding-bottom: 5px; -} -.btn-group.open { - *z-index: 1000; -} -.btn-group.open .dropdown-menu { - display: block; - margin-top: 1px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn .caret { - margin-top: 7px; - margin-left: 0; -} -.btn:hover .caret, .open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-primary .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); -} -.btn-small .caret { - margin-top: 4px; -} -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 18px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.alert, .alert-heading { - color: #c09853; -} -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 18px; -} -.alert-success { - background-color: #dff0d8; - border-color: #d6e9c6; -} -.alert-success, .alert-success .alert-heading { - color: #468847; -} -.alert-danger, .alert-error { - background-color: #f2dede; - border-color: #eed3d7; -} -.alert-danger, -.alert-error, -.alert-danger .alert-heading, -.alert-error .alert-heading { - color: #b94a48; -} -.alert-info { - background-color: #d9edf7; - border-color: #bce8f1; -} -.alert-info, .alert-info .alert-heading { - color: #3a87ad; -} -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, .alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} -.nav { - margin-left: 0; - margin-bottom: 18px; - list-style: none; -} -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} -.nav .nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} -.nav li + .nav-header { - margin-top: 9px; -} -.nav-list { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; -} -.nav-list > li > a, .nav-list .nav-header { - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.nav-list > li > a { - padding: 3px 15px; -} -.nav-list .active > a, .nav-list .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} -.nav-list [class^="icon-"] { - margin-right: 2px; -} -.nav-tabs, .nav-pills { - *zoom: 1; -} -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - content: ""; -} -.nav-tabs:after, .nav-pills:after { - clear: both; -} -.nav-tabs > li, .nav-pills > li { - float: left; -} -.nav-tabs > li > a, .nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} -.nav-tabs { - border-bottom: 1px solid #ddd; -} -.nav-tabs > li { - margin-bottom: -1px; -} -.nav-tabs > li > a { - padding-top: 9px; - padding-bottom: 9px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} -.nav-tabs > .active > a, .nav-tabs > .active > a:hover { - color: #555555; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.nav-pills .active > a, .nav-pills .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} -.nav-stacked > li { - float: none; -} -.nav-stacked > li > a { - margin-right: 0; -} -.nav-tabs.nav-stacked { - border-bottom: 0; -} -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.nav-tabs.nav-stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} -.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu { - margin-top: 1px; - border-width: 1px; -} -.nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { - border-top-color: #0088cc; - margin-top: 6px; -} -.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { - border-top-color: #005580; -} -.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; -} -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; -} -.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} -.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { - border-top-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} -.tabs-stacked .open > a:hover { - border-color: #999999; -} -.tabbable { - *zoom: 1; -} -.tabbable:before, .tabbable:after { - display: table; - content: ""; -} -.tabbable:after { - clear: both; -} -.tab-content { - overflow: hidden; -} -.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { - border-bottom: 0; -} -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; -} -.tab-content > .active, .pill-content > .active { - display: block; -} -.tabs-below .nav-tabs { - border-top: 1px solid #ddd; -} -.tabs-below .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabs-below .nav-tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; -} -.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} -.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li { - float: none; -} -.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} -.tabs-left .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} -.tabs-left .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} -.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} -.tabs-right .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} -.tabs-right .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} -.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} -.navbar { - overflow: visible; - margin-bottom: 18px; -} -.navbar-inner { - padding-left: 20px; - padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -} -.btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} -.btn-navbar:hover, -.btn-navbar:active, -.btn-navbar.active, -.btn-navbar.disabled, -.btn-navbar[disabled] { - background-color: #222222; -} -.btn-navbar:active, .btn-navbar.active { - background-color: #080808 \9; -} -.btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} -.nav-collapse.collapse { - height: auto; -} -.navbar .brand:hover { - text-decoration: none; -} -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; -} -.navbar .navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #999999; -} -.navbar .navbar-text a:hover { - color: #ffffff; - background-color: transparent; -} -.navbar .btn, .navbar .btn-group { - margin-top: 5px; -} -.navbar .btn-group .btn { - margin-top: 0; -} -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} -.navbar-form:before, .navbar-form:after { - display: table; - content: ""; -} -.navbar-form:after { - clear: both; -} -.navbar-form input, .navbar-form select { - display: inline-block; - margin-top: 5px; - margin-bottom: 0; -} -.navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; -} -.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { - margin-top: 3px; -} -.navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; - white-space: nowrap; -} -.navbar-form .input-append input, .navbar-form .input-prepend input { - margin-top: 0; -} -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - color: rgba(255, 255, 255, 0.75); - background: #666; - background: rgba(255, 255, 255, 0.3); - border: 1px solid #111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query :-moz-placeholder { - color: #eeeeee; -} -.navbar-search .search-query::-webkit-input-placeholder { - color: #eeeeee; -} -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #999999; - background-color: rgba(255, 255, 255, 0.5); -} -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-fixed-top { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: 1030; -} -.navbar-fixed-top .navbar-inner { - padding-left: 0; - padding-right: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; -} -.navbar .nav > li { - display: block; - float: left; -} -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; -} -.navbar .nav .active > a, .navbar .nav .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} -.navbar .dropdown-menu { - margin-top: 1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { - border-top-color: #ffffff; -} -.navbar .nav .active .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #ffffff; -} -.navbar .nav.pull-right .dropdown-menu { - left: auto; - right: 0; -} -.navbar .nav.pull-right .dropdown-menu:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .dropdown-menu:after { - left: auto; - right: 13px; -} -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - text-shadow: 0 1px 0 #ffffff; -} -.breadcrumb .divider { - padding: 0 5px; - color: #999999; -} -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; -} -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} -.pagination li { - display: inline; -} -.pagination a { - float: left; - padding: 0 14px; - line-height: 34px; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; -} -.pagination a:hover, .pagination .active a { - background-color: #f5f5f5; -} -.pagination .active a { - color: #999999; - cursor: default; -} -.pagination .disabled a, .pagination .disabled a:hover { - color: #999999; - background-color: transparent; - cursor: default; -} -.pagination li:first-child a { - border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} -.pager { - margin-left: 0; - margin-bottom: 18px; - list-style: none; - text-align: center; - *zoom: 1; -} -.pager:before, .pager:after { - display: table; - content: ""; -} -.pager:after { - clear: both; -} -.pager li { - display: inline; -} -.pager a { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pager a:hover { - text-decoration: none; - background-color: #f5f5f5; -} -.pager .next a { - float: right; -} -.pager .previous a { - float: left; -} -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} -.modal-backdrop.fade { - opacity: 0; -} -.modal-backdrop, .modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 1050; - max-height: 500px; - overflow: auto; - width: 560px; - margin: -250px 0 0 -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - /* IE6-7 */ - - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.modal.fade { - -webkit-transition: opacity .3s linear, top .3s ease-out; - -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; - -o-transition: opacity .3s linear, top .3s ease-out; - transition: opacity .3s linear, top .3s ease-out; - top: -25%; -} -.modal.fade.in { - top: 50%; -} -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} -.modal-header .close { - margin-top: 2px; -} -.modal-body { - padding: 15px; -} -.modal-body .modal-form { - margin-bottom: 0; -} -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; - *zoom: 1; -} -.modal-footer:before, .modal-footer:after { - display: table; - content: ""; -} -.modal-footer:after { - clear: both; -} -.modal-footer .btn { - float: right; - margin-left: 5px; - margin-bottom: 0; -} -.tooltip { - position: absolute; - z-index: 1020; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); -} -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.tooltip.top { - margin-top: -2px; -} -.tooltip.right { - margin-left: 2px; -} -.tooltip.bottom { - margin-top: 2px; -} -.tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover-content p, .popover-content ul, .popover-content ol { - margin-bottom: 0; -} -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} -.thumbnails:before, .thumbnails:after { - display: table; - content: ""; -} -.thumbnails:after { - clear: both; -} -.thumbnails > li { - float: left; - margin: 0 0 18px 20px; -} -.thumbnail { - display: block; - padding: 4px; - line-height: 1; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} -.thumbnail > img { - display: block; - max-width: 100%; - margin-left: auto; - margin-right: auto; -} -.thumbnail .caption { - padding: 9px; -} -.label { - padding: 2px 4px 3px; - font-size: 11.049999999999999px; - font-weight: bold; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.label:hover { - color: #ffffff; - text-decoration: none; -} -.label-important { - background-color: #b94a48; -} -.label-important:hover { - background-color: #953b39; -} -.label-warning { - background-color: #f89406; -} -.label-warning:hover { - background-color: #c67605; -} -.label-success { - background-color: #468847; -} -.label-success:hover { - background-color: #356635; -} -.label-info { - background-color: #3a87ad; -} -.label-info:hover { - background-color: #2d6987; -} -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@-moz-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -.progress { - overflow: hidden; - height: 18px; - margin-bottom: 18px; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.progress .bar { - width: 0%; - height: 18px; - color: #ffffff; - font-size: 12px; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} -.progress-striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress-danger .bar { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} -.progress-danger.progress-striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress-success .bar { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} -.progress-success.progress-striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress-info .bar { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} -.progress-info.progress-striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.accordion { - margin-bottom: 18px; -} -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.accordion-heading { - border-bottom: 0; -} -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} -.carousel { - position: relative; - margin-bottom: 18px; - line-height: 1; -} -.carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} -.carousel .item { - display: none; - position: relative; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel .item > img { - display: block; - line-height: 1; -} -.carousel .active, .carousel .next, .carousel .prev { - display: block; -} -.carousel .active { - left: 0; -} -.carousel .next, .carousel .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel .next { - left: 100%; -} -.carousel .prev { - left: -100%; -} -.carousel .next.left, .carousel .prev.right { - left: 0; -} -.carousel .active.left { - left: -100%; -} -.carousel .active.right { - left: 100%; -} -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} -.carousel-control.right { - left: auto; - right: 15px; -} -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 10px 15px 5px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} -.carousel-caption h4, .carousel-caption p { - color: #ffffff; -} -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #f5f5f5; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; -} -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; -} -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.hide { - display: none; -} -.show { - display: block; -} -.invisible { - visibility: hidden; -} - -.firewall-permitted { - color: green; -} - -.firewall-blocked { - color: red; -} diff --git a/themes/default/css/bootstrap.min.css b/themes/default/css/bootstrap.min.css new file mode 120000 index 000000000..e67d4eb86 --- /dev/null +++ b/themes/default/css/bootstrap.min.css @@ -0,0 +1 @@ +/usr/share/twitter-bootstrap/files/css/bootstrap.min.css \ No newline at end of file diff --git a/themes/default/css/plinth.css b/themes/default/css/plinth.css new file mode 100644 index 000000000..c983d7042 --- /dev/null +++ b/themes/default/css/plinth.css @@ -0,0 +1,57 @@ +@media (min-width: 979px) { + body { + padding-top: 60px; + } +} + +body { + padding-bottom: 40px; +} + +.sidebar-nav { + padding: 9px 0; +} + +.super-hero { + margin-top: 25px; +} + +.logo-top { + float: left; + padding-right: 5px; +} + +.brand { + padding-top: 8px; +} + +.white { + color: #fff; +} + +.error-large { + font-size: 1.2em; + padding: 10px; +} + +.main-graphic { + float: right; + padding: 25px; +} + +.nav-icon { + margin-right: 8px; +} + +.sidenav-icon { + margin-right: 8px; + padding-right: 5px; +} + +.table-autowidth { + width: auto; +} + +.table td.cell-indented { + padding-left: 3em; +} diff --git a/themes/default/js/functions.js b/themes/default/js/functions.js deleted file mode 100644 index 950e4b287..000000000 --- a/themes/default/js/functions.js +++ /dev/null @@ -1,23 +0,0 @@ -// remap jQuery to $ -(function($){})(window.jQuery); - - -/* trigger when page is ready */ -$(document).ready(function (){ - - // your functions go here - -}); - - -/* optional triggers - -$(window).load(function() { - -}); - -$(window).resize(function() { - -}); - -*/ diff --git a/themes/default/js/libs/bootstrap.min.js b/themes/default/js/libs/bootstrap.min.js new file mode 120000 index 000000000..58c63206a --- /dev/null +++ b/themes/default/js/libs/bootstrap.min.js @@ -0,0 +1 @@ +/usr/share/twitter-bootstrap/files/js/bootstrap.min.js \ No newline at end of file diff --git a/themes/default/js/libs/bootstrap/alert.js b/themes/default/js/libs/bootstrap/alert.js deleted file mode 100644 index 111caf974..000000000 --- a/themes/default/js/libs/bootstrap/alert.js +++ /dev/null @@ -1,91 +0,0 @@ -/* ========================================================== - * bootstrap-alert.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype = { - - constructor: Alert - - , close: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.trigger('close') - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.removeClass('in') - - function removeElement() { - $parent.remove() - $parent.trigger('closed') - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - $.fn.alert = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/bootstrap.js b/themes/default/js/libs/bootstrap/bootstrap.js deleted file mode 100644 index 071e1d424..000000000 --- a/themes/default/js/libs/bootstrap/bootstrap.js +++ /dev/null @@ -1,1722 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - $(function () { - - "use strict" - - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - - return support && { - end: (function () { - var transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - return transitionEnd - }()) - } - })() - - }) - -}( window.jQuery ) -/* ========================================================== - * bootstrap-alert.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype = { - - constructor: Alert - - , close: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.trigger('close') - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.removeClass('in') - - function removeElement() { - $parent.remove() - $parent.trigger('closed') - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - $.fn.alert = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}( window.jQuery ) -/* ============================================================ - * bootstrap-button.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype = { - - constructor: Button - - , setState: function ( state ) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - , toggle: function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - $.fn.button = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON DATA-API - * =============== */ - - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - $(e.target).button('toggle') - }) - }) - -}( window.jQuery ) -/* ========================================================== - * bootstrap-carousel.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.carousel.defaults, options) - this.options.slide && this.slide(this.options.slide) - } - - Carousel.prototype = { - - cycle: function () { - this.interval = setInterval($.proxy(this.next, this), this.options.interval) - return this - } - - , to: function (pos) { - var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } - - , pause: function () { - clearInterval(this.interval) - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if (!$.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger('slide') - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } else { - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.trigger('slide') - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - $.fn.carousel = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = typeof option == 'object' && option - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() - else data.cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) - }) - -}( window.jQuery ) -/* ============================================================= - * bootstrap-collapse.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - var Collapse = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options["parent"]) { - this.$parent = $(this.options["parent"]) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension = this.dimension() - , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('.in') - , hasData - - if (actives && actives.length) { - hasData = actives.data('collapse') - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', 'show', 'shown') - this.$element[dimension](this.$element[0][scroll]) - - } - - , hide: function () { - var dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', 'hide', 'hidden') - this.$element[dimension](0) - } - - , reset: function ( size ) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element.addClass('collapse') - } - - , transition: function ( method, startEvent, completeEvent ) { - var that = this - , complete = function () { - if (startEvent == 'show') that.reset() - that.$element.trigger(completeEvent) - } - - this.$element - .trigger(startEvent) - [method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}( window.jQuery ) -/* ============================================================ - * bootstrap-dropdown.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function( $ ){ - - "use strict" - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle="dropdown"]' - , Dropdown = function ( element ) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - , isActive - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - isActive = $parent.hasClass('open') - - clearMenus() - !isActive && $parent.toggleClass('open') - - return false - } - - } - - function clearMenus() { - $(toggle).parent().removeClass('open') - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html').on('click.dropdown.data-api', clearMenus) - $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) - }) - -}( window.jQuery ) -/* ========================================================= - * bootstrap-modal.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function( $ ){ - - "use strict" - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function ( content, options ) { - this.options = $.extend({}, $.fn.modal.defaults, options) - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - - if (this.isShown) return - - $('body').addClass('modal-open') - - this.isShown = true - this.$element.trigger('show') - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function ( e ) { - e && e.preventDefault() - - if (!this.isShown) return - - var that = this - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element - .trigger('hide') - .removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } - - } - - - /* MODAL PRIVATE METHODS - * ===================== */ - - function hideWithTransition() { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) - }) - } - - function hideModal( that ) { - this.$element - .hide() - .trigger('hidden') - - backdrop.call(this) - } - - function backdrop( callback ) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
      ') - .appendTo(document.body) - - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) - - } else if (callback) { - callback() - } - } - - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null - } - - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = typeof option == 'object' && option - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL DATA-API - * ============== */ - - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) - - e.preventDefault() - $target.modal(option) - }) - }) - -}( window.jQuery ) -/* =========================================================== - * bootstrap-tooltip.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - "use strict" - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function ( element, options ) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function ( type, element, options ) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function ( options ) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - self.hoverState = 'in' - setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) - } - } - - , leave: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - self.hoverState = 'out' - setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) - } - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , setContent: function () { - var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - title = title.toString().replace(/(^\s*|\s*$)/, "") - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , delay: 0 - , selector: false - , placement: 'top' - , trigger: 'hover' - , title: '' - , template: '
      ' - } - -}( window.jQuery ) -/* =========================================================== - * bootstrap-popover.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function( $ ) { - - "use strict" - - var Popover = function ( element, options ) { - this.init('popover', element, options) - } - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) - $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - content = content.toString().replace(/(^\s*|\s*$)/, "") - - return content - } - - , tip: function() { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

      ' - }) - -}( window.jQuery ) -/* ============================================================= - * bootstrap-scrollspy.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - -!function ( $ ) { - - "use strict" - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy( element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body').on('click.scroll.data-api', this.selector, process) - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - this.targets = this.$body - .find(this.selector) - .map(function () { - var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null - }) - - this.offsets = $.map(this.targets, function (id) { - return $(id).position().top - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - - this.activeTarget = target - - this.$body - .find(this.selector).parent('.active') - .removeClass('active') - - active = this.$body - .find(this.selector + '[href="' + target + '"]') - .parent('li') - .addClass('active') - - if ( active.parent('.dropdown-menu') ) { - active.closest('li.dropdown').addClass('active') - } - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollspy = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}( window.jQuery ) -/* ======================================================== - * bootstrap-tab.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function( $ ){ - - "use strict" - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function ( element ) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active a').last()[0] - - $this.trigger({ - type: 'show' - , relatedTarget: previous - }) - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB DATA-API - * ============ */ - - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - }) - -}( window.jQuery ) -/* ============================================================= - * bootstrap-typeahead.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - var Typeahead = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element.val(val) - return this.hide() - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var that = this - , items - , q - - this.query = this.$element.val() - - if (!this.query) { - return this.shown ? this.hide() : this - } - - items = $.grep(this.source, function (item) { - if (that.matcher(item)) return item - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keypress, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , keyup: function (e) { - e.stopPropagation() - e.preventDefault() - - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - this.hide() - break - - default: - this.lookup() - } - - } - - , keypress: function (e) { - e.stopPropagation() - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - } - - , blur: function (e) { - var that = this - e.stopPropagation() - e.preventDefault() - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - $.fn.typeahead = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
        ' - , item: '
        • ' - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/bootstrap.min.js b/themes/default/js/libs/bootstrap/bootstrap.min.js deleted file mode 100644 index 3539479f6..000000000 --- a/themes/default/js/libs/bootstrap/bootstrap.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.remove(),e.trigger("closed")}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){a(b.target).button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide)};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;return this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element.addClass("collapse")},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
        ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=a.extend({},a.fn.modal.defaults,c),this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=typeof c=="object"&&c;e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
        '}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

        '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){a.stopPropagation(),a.preventDefault();switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:this.hide();break;default:this.lookup()}},keypress:function(a){a.stopPropagation();if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}},blur:function(a){var b=this;a.stopPropagation(),a.preventDefault(),setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
          ',item:'
          • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); diff --git a/themes/default/js/libs/bootstrap/button.js b/themes/default/js/libs/bootstrap/button.js deleted file mode 100644 index a2809bfb4..000000000 --- a/themes/default/js/libs/bootstrap/button.js +++ /dev/null @@ -1,98 +0,0 @@ -/* ============================================================ - * bootstrap-button.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype = { - - constructor: Button - - , setState: function ( state ) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - , toggle: function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - $.fn.button = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON DATA-API - * =============== */ - - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - $(e.target).button('toggle') - }) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/carousel.js b/themes/default/js/libs/bootstrap/carousel.js deleted file mode 100644 index f92ef61b5..000000000 --- a/themes/default/js/libs/bootstrap/carousel.js +++ /dev/null @@ -1,154 +0,0 @@ -/* ========================================================== - * bootstrap-carousel.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.carousel.defaults, options) - this.options.slide && this.slide(this.options.slide) - } - - Carousel.prototype = { - - cycle: function () { - this.interval = setInterval($.proxy(this.next, this), this.options.interval) - return this - } - - , to: function (pos) { - var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } - - , pause: function () { - clearInterval(this.interval) - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if (!$.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger('slide') - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } else { - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.trigger('slide') - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - $.fn.carousel = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = typeof option == 'object' && option - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() - else data.cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/collapse.js b/themes/default/js/libs/bootstrap/collapse.js deleted file mode 100644 index d0aea2063..000000000 --- a/themes/default/js/libs/bootstrap/collapse.js +++ /dev/null @@ -1,136 +0,0 @@ -/* ============================================================= - * bootstrap-collapse.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - var Collapse = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options["parent"]) { - this.$parent = $(this.options["parent"]) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension = this.dimension() - , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('.in') - , hasData - - if (actives && actives.length) { - hasData = actives.data('collapse') - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', 'show', 'shown') - this.$element[dimension](this.$element[0][scroll]) - - } - - , hide: function () { - var dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', 'hide', 'hidden') - this.$element[dimension](0) - } - - , reset: function ( size ) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element.addClass('collapse') - } - - , transition: function ( method, startEvent, completeEvent ) { - var that = this - , complete = function () { - if (startEvent == 'show') that.reset() - that.$element.trigger(completeEvent) - } - - this.$element - .trigger(startEvent) - [method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/dropdown.js b/themes/default/js/libs/bootstrap/dropdown.js deleted file mode 100644 index 2588cffc8..000000000 --- a/themes/default/js/libs/bootstrap/dropdown.js +++ /dev/null @@ -1,92 +0,0 @@ -/* ============================================================ - * bootstrap-dropdown.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function( $ ){ - - "use strict" - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle="dropdown"]' - , Dropdown = function ( element ) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - , isActive - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - isActive = $parent.hasClass('open') - - clearMenus() - !isActive && $parent.toggleClass('open') - - return false - } - - } - - function clearMenus() { - $(toggle).parent().removeClass('open') - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html').on('click.dropdown.data-api', clearMenus) - $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/modal.js b/themes/default/js/libs/bootstrap/modal.js deleted file mode 100644 index 03fb69b64..000000000 --- a/themes/default/js/libs/bootstrap/modal.js +++ /dev/null @@ -1,209 +0,0 @@ -/* ========================================================= - * bootstrap-modal.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function( $ ){ - - "use strict" - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function ( content, options ) { - this.options = $.extend({}, $.fn.modal.defaults, options) - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - - if (this.isShown) return - - $('body').addClass('modal-open') - - this.isShown = true - this.$element.trigger('show') - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function ( e ) { - e && e.preventDefault() - - if (!this.isShown) return - - var that = this - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element - .trigger('hide') - .removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } - - } - - - /* MODAL PRIVATE METHODS - * ===================== */ - - function hideWithTransition() { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) - }) - } - - function hideModal( that ) { - this.$element - .hide() - .trigger('hidden') - - backdrop.call(this) - } - - function backdrop( callback ) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
          ') - .appendTo(document.body) - - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) - - } else if (callback) { - callback() - } - } - - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null - } - - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = typeof option == 'object' && option - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL DATA-API - * ============== */ - - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) - - e.preventDefault() - $target.modal(option) - }) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/popover.js b/themes/default/js/libs/bootstrap/popover.js deleted file mode 100644 index 280c73213..000000000 --- a/themes/default/js/libs/bootstrap/popover.js +++ /dev/null @@ -1,95 +0,0 @@ -/* =========================================================== - * bootstrap-popover.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function( $ ) { - - "use strict" - - var Popover = function ( element, options ) { - this.init('popover', element, options) - } - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) - $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - content = content.toString().replace(/(^\s*|\s*$)/, "") - - return content - } - - , tip: function() { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

          ' - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/scrollspy.js b/themes/default/js/libs/bootstrap/scrollspy.js deleted file mode 100644 index 3601e01e4..000000000 --- a/themes/default/js/libs/bootstrap/scrollspy.js +++ /dev/null @@ -1,125 +0,0 @@ -/* ============================================================= - * bootstrap-scrollspy.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - -!function ( $ ) { - - "use strict" - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy( element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body').on('click.scroll.data-api', this.selector, process) - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - this.targets = this.$body - .find(this.selector) - .map(function () { - var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null - }) - - this.offsets = $.map(this.targets, function (id) { - return $(id).position().top - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - - this.activeTarget = target - - this.$body - .find(this.selector).parent('.active') - .removeClass('active') - - active = this.$body - .find(this.selector + '[href="' + target + '"]') - .parent('li') - .addClass('active') - - if ( active.parent('.dropdown-menu') ) { - active.closest('li.dropdown').addClass('active') - } - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollspy = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/tab.js b/themes/default/js/libs/bootstrap/tab.js deleted file mode 100644 index 032fa7faf..000000000 --- a/themes/default/js/libs/bootstrap/tab.js +++ /dev/null @@ -1,130 +0,0 @@ -/* ======================================================== - * bootstrap-tab.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function( $ ){ - - "use strict" - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function ( element ) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active a').last()[0] - - $this.trigger({ - type: 'show' - , relatedTarget: previous - }) - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB DATA-API - * ============ */ - - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/tooltip.js b/themes/default/js/libs/bootstrap/tooltip.js deleted file mode 100644 index 77a88fe9f..000000000 --- a/themes/default/js/libs/bootstrap/tooltip.js +++ /dev/null @@ -1,270 +0,0 @@ -/* =========================================================== - * bootstrap-tooltip.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - "use strict" - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function ( element, options ) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function ( type, element, options ) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function ( options ) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - self.hoverState = 'in' - setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) - } - } - - , leave: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - self.hoverState = 'out' - setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) - } - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , setContent: function () { - var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - title = title.toString().replace(/(^\s*|\s*$)/, "") - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , delay: 0 - , selector: false - , placement: 'top' - , trigger: 'hover' - , title: '' - , template: '
          ' - } - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/transition.js b/themes/default/js/libs/bootstrap/transition.js deleted file mode 100644 index 71371f7ce..000000000 --- a/themes/default/js/libs/bootstrap/transition.js +++ /dev/null @@ -1,51 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - $(function () { - - "use strict" - - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - - return support && { - end: (function () { - var transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - return transitionEnd - }()) - } - })() - - }) - -}( window.jQuery ) diff --git a/themes/default/js/libs/bootstrap/typeahead.js b/themes/default/js/libs/bootstrap/typeahead.js deleted file mode 100644 index 5908d342c..000000000 --- a/themes/default/js/libs/bootstrap/typeahead.js +++ /dev/null @@ -1,271 +0,0 @@ -/* ============================================================= - * bootstrap-typeahead.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - var Typeahead = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element.val(val) - return this.hide() - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var that = this - , items - , q - - this.query = this.$element.val() - - if (!this.query) { - return this.shown ? this.hide() : this - } - - items = $.grep(this.source, function (item) { - if (that.matcher(item)) return item - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keypress, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , keyup: function (e) { - e.stopPropagation() - e.preventDefault() - - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - this.hide() - break - - default: - this.lookup() - } - - } - - , keypress: function (e) { - e.stopPropagation() - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - } - - , blur: function (e) { - var that = this - e.stopPropagation() - e.preventDefault() - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - $.fn.typeahead = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
            ' - , item: '
            • ' - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) - }) - -}( window.jQuery ) diff --git a/themes/default/js/menu.js b/themes/default/js/menu.js deleted file mode 100644 index 8617d42ed..000000000 --- a/themes/default/js/menu.js +++ /dev/null @@ -1,67 +0,0 @@ -function main_menu(items) { - output = '
              ' - for (item in items) { - i = items[item]; - - // Handle active page - if (i["active"]) { - active = ' class="active"'; - } else { - active = ''; - } - - // Line break labels - /*label = i["label"]; - if (label.search(" ") != -1) { - label = label.replace(" ", "
              "); - } else { - label = " 
              " + label; - }*/ - - // Add icon before labels - icon = ''; - label = icon + i["label"]; - - output = output +'' + label + ""; - } - output = output + "
            "; - document.write(output); -} - -function render_items(items) { - output = '
            • Menu
              • '; - for (item in items) { - i = items[item]; - - // Handle active page - if (i["active"]) { - active = ' class="active"'; - - // Add icon before labels - icon = ''; - label = icon + i["label"]; - } else { - active = ''; - - // Add icon before labels - icon = ''; - label = icon + i["label"]; - } - - output = output +'' + label + ""; - - if (i['subs']) { - output += render_items(i['subs']); - } - } - output = output + "
            "; - return output -} - -function side_menu(items) { - if (items.length == 0) { - return 0; - } - output = render_items(items); - document.write(output); -} diff --git a/themes/default/js/plinth.js b/themes/default/js/plinth.js deleted file mode 100644 index dfe144397..000000000 --- a/themes/default/js/plinth.js +++ /dev/null @@ -1,16 +0,0 @@ -function toggle_visibility(id) { - var d = document.getElementById(id); - if(d.style.display == 'block') - d.style.display = 'none'; - else - d.style.display = 'block'; -} - -function show(id) { - var d = document.getElementById(id); - d.style.display = 'block'; -} - -function hide(id) { - document.getElementById(id).style.display = 'none'; -} diff --git a/themes/default/js/plugins.js b/themes/default/js/plugins.js deleted file mode 100644 index 07c4f2d62..000000000 --- a/themes/default/js/plugins.js +++ /dev/null @@ -1,34 +0,0 @@ -// usage: log('inside coolFunc', this, arguments); -// paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/ -window.log = function f(){ log.history = log.history || []; log.history.push(arguments); if(this.console) { var args = arguments, newarr; args.callee = args.callee.caller; newarr = [].slice.call(args); if (typeof console.log === 'object') log.apply.call(console.log, console, newarr); else console.log.apply(console, newarr);}}; - -// make it safe to use console.log always -(function(a){function b(){}for(var c="assert,count,debug,dir,dirxml,error,exception,group,groupCollapsed,groupEnd,info,log,markTimeline,profile,profileEnd,time,timeEnd,trace,warn".split(","),d;!!(d=c.pop());){a[d]=a[d]||b;}}) -(function(){try{console.log();return window.console;}catch(a){return (window.console={});}}()); - - -// place any jQuery/helper plugins in here, instead of separate, slower script files. - -// remap jQuery to $ -(function($){})(window.jQuery); - - -/* trigger when page is ready */ -$(document).ready(function (){ - - // your functions go here - -}); - - -/* optional triggers - -$(window).load(function() { - -}); - -$(window).resize(function() { - -}); - -*/ diff --git a/themes/default/style.css b/themes/default/style.css deleted file mode 120000 index 234a393d0..000000000 --- a/themes/default/style.css +++ /dev/null @@ -1 +0,0 @@ -css/bootstrap.css \ No newline at end of file diff --git a/util.py b/util.py index 4f2ba018f..39e044e77 100644 --- a/util.py +++ b/util.py @@ -1,9 +1,10 @@ -import os, sys +import os +import sys import cherrypy import cfg -import importlib import sqlite3 +from django.template.loader import render_to_string from filedict import FileDict @@ -60,37 +61,25 @@ class Message(): def add(self, text): self.text += "
            %s" % text -def page_template(template='login_nav', **kwargs): - for k in ['sidebar_left', 'sidebar_right', 'main', 'js', 'onload', 'nav', 'css', 'title', 'basehref']: - if not k in kwargs: - kwargs[k] = '' + +def render_template(template='login_nav', **kwargs): + for key in ['sidebar_left', 'sidebar_right', 'main', 'js', 'nav', 'css', + 'title', 'basehref']: + if not key in kwargs: + kwargs[key] = '' if kwargs['basehref'] == '': - kwargs['basehref'] = cfg.server_dir - #if template=='base' and kwargs['sidebar_right']=='': - # template='two_col' - if isinstance(template, basestring): - template_module = importlib.import_module('templates.' + template) - template = getattr(template_module, template) - try: - submenu = cfg.main_menu.active_item().encode("sub_menu", render_subs=True) - except AttributeError: - submenu = "" + kwargs['basehref'] = cfg.server_dir kwargs['template'] = template - kwargs['main_menu_js'] = cfg.main_menu.encode("main_menu") - kwargs['sub_menu_js'] = submenu + kwargs['main_menu'] = cfg.main_menu + kwargs['submenu'] = cfg.main_menu.active_item() kwargs['current_url'] = cherrypy.url() kwargs['username'] = cherrypy.session.get(cfg.session_key) + kwargs['cfg'] = cfg - if not kwargs['nav'] and submenu: - kwargs['nav'] = """ """ + return render_to_string(template + '.html', kwargs) - return str(template(searchList=[kwargs])) def filedict_con(filespec=None, table='dict'): """TODO: better error handling in filedict_con"""