diff --git a/INSTALL b/INSTALL index 6c9297cf1..fc3255e8d 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ On a Debian based system, run: $ sudo apt-get install libjs-jquery libjs-modernizr \ - libjs-twitter-bootstrap make pandoc python3 python3-cherrypy3 \ + libjs-bootstrap make pandoc python3 python3-cherrypy3 \ python3-django python3-bootstrapform python3-setuptools 2. Install Plinth: diff --git a/plinth/modules/apps/apps.py b/plinth/modules/apps/apps.py index 69cc1b90e..fb3226fcf 100644 --- a/plinth/modules/apps/apps.py +++ b/plinth/modules/apps/apps.py @@ -6,7 +6,7 @@ from plinth import cfg def init(): """Initailize the apps module""" - cfg.main_menu.add_urlname("Apps", "icon-download-alt", "apps:index", 80) + cfg.main_menu.add_urlname("Apps", "glyphicon-download-alt", "apps:index", 80) def index(request): diff --git a/plinth/modules/config/config.py b/plinth/modules/config/config.py index c7691332e..5ab181a58 100644 --- a/plinth/modules/config/config.py +++ b/plinth/modules/config/config.py @@ -95,7 +95,7 @@ and must not be greater than 63 characters in length.'), def init(): """Initialize the module""" menu = cfg.main_menu.get('system:index') - menu.add_urlname(_('Configure'), 'icon-cog', 'config:index', 10) + menu.add_urlname(_('Configure'), 'glyphicon-cog', 'config:index', 10) @login_required diff --git a/plinth/modules/diagnostics/diagnostics.py b/plinth/modules/diagnostics/diagnostics.py index 295f0efd4..953c67c2c 100644 --- a/plinth/modules/diagnostics/diagnostics.py +++ b/plinth/modules/diagnostics/diagnostics.py @@ -31,7 +31,7 @@ from plinth.errors import ActionError def init(): """Initialize the module""" menu = cfg.main_menu.get('system:index') - menu.add_urlname("Diagnostics", "icon-screenshot", "diagnostics:index", 30) + menu.add_urlname("Diagnostics", "glyphicon-screenshot", "diagnostics:index", 30) @login_required diff --git a/plinth/modules/expert_mode/expert_mode.py b/plinth/modules/expert_mode/expert_mode.py index f7c40939c..f96de0ad1 100644 --- a/plinth/modules/expert_mode/expert_mode.py +++ b/plinth/modules/expert_mode/expert_mode.py @@ -17,7 +17,7 @@ class ExpertsForm(forms.Form): # pylint: disable-msg=W0232 def init(): """Initialize the module""" menu = cfg.main_menu.get('system:index') - menu.add_urlname(_('Expert Mode'), 'icon-cog', 'expert_mode:index', 10) + menu.add_urlname(_('Expert Mode'), 'glyphicon-wrench', 'expert_mode:index', 10) @login_required diff --git a/plinth/modules/firewall/firewall.py b/plinth/modules/firewall/firewall.py index 0af54691b..c13b02eca 100644 --- a/plinth/modules/firewall/firewall.py +++ b/plinth/modules/firewall/firewall.py @@ -36,7 +36,7 @@ LOGGER = logging.getLogger(__name__) def init(): """Initailze firewall module""" menu = cfg.main_menu.get('system:index') - menu.add_urlname(_('Firewall'), 'icon-flag', 'firewall:index', 50) + menu.add_urlname(_('Firewall'), 'glyphicon-flag', 'firewall:index', 50) service_enabled.connect(on_service_enabled) diff --git a/plinth/modules/help/help.py b/plinth/modules/help/help.py index 4cbe8e893..686657a58 100644 --- a/plinth/modules/help/help.py +++ b/plinth/modules/help/help.py @@ -8,17 +8,17 @@ from plinth import cfg def init(): """Initialize the Help module""" - menu = cfg.main_menu.add_urlname(_('Documentation'), 'icon-book', + menu = cfg.main_menu.add_urlname(_('Documentation'), 'glyphicon-book', 'help:index', 101) - menu.add_urlname(_('Where to Get Help'), 'icon-search', + menu.add_urlname(_('Where to Get Help'), 'glyphicon-search', 'help:index_explicit', 5) - menu.add_urlname(_('Developer\'s Manual'), 'icon-info-sign', + menu.add_urlname(_('Developer\'s Manual'), 'glyphicon-info-sign', 'help:helppage', 10, url_args=('plinth',)) - menu.add_urlname(_('FAQ'), 'icon-question-sign', 'help:helppage', 20, + menu.add_urlname(_('FAQ'), 'glyphicon-question-sign', 'help:helppage', 20, url_args=('faq',)) - menu.add_item(_('%s Wiki' % cfg.box_name), 'icon-pencil', + menu.add_item(_('%s Wiki' % cfg.box_name), 'glyphicon-pencil', 'http://wiki.debian.org/FreedomBox', 30) - menu.add_urlname(_('About'), 'icon-star', 'help:about', 100) + menu.add_urlname(_('About'), 'glyphicon-star', 'help:about', 100) def index(request): diff --git a/plinth/modules/owncloud/owncloud.py b/plinth/modules/owncloud/owncloud.py index 217ac3221..b6f1eab0a 100644 --- a/plinth/modules/owncloud/owncloud.py +++ b/plinth/modules/owncloud/owncloud.py @@ -20,7 +20,7 @@ class OwnCloudForm(forms.Form): # pylint: disable-msg=W0232 def init(): """Initialize the ownCloud module""" menu = cfg.main_menu.get('apps:index') - menu.add_urlname('Owncloud', 'icon-picture', 'owncloud:index', 35) + menu.add_urlname('Owncloud', 'glyphicon-picture', 'owncloud:index', 35) status = get_status() diff --git a/plinth/modules/packages/packages.py b/plinth/modules/packages/packages.py index 05e00fce2..1b60720aa 100644 --- a/plinth/modules/packages/packages.py +++ b/plinth/modules/packages/packages.py @@ -40,7 +40,7 @@ class PackagesForm(forms.Form): def init(): """Initialize the Packages module""" menu = cfg.main_menu.get('system:index') - menu.add_urlname('Package Manager', 'icon-gift', 'packages:index', 20) + menu.add_urlname('Package Manager', 'glyphicon-gift', 'packages:index', 20) @login_required diff --git a/plinth/modules/pagekite/pagekite.py b/plinth/modules/pagekite/pagekite.py index 7e49ee029..337b39dfb 100644 --- a/plinth/modules/pagekite/pagekite.py +++ b/plinth/modules/pagekite/pagekite.py @@ -40,7 +40,7 @@ LOGGER = logging.getLogger(__name__) def init(): """Intialize the PageKite module""" menu = cfg.main_menu.get('apps:index') - menu.add_urlname(_('Public Visibility (PageKite)'), 'icon-flag', + menu.add_urlname(_('Public Visibility (PageKite)'), 'glyphicon-flag', 'pagekite:index', 50) diff --git a/plinth/modules/system/system.py b/plinth/modules/system/system.py index 24cad9fa7..e31b40656 100644 --- a/plinth/modules/system/system.py +++ b/plinth/modules/system/system.py @@ -6,7 +6,7 @@ from plinth import cfg def init(): """Initialize the system module""" - cfg.main_menu.add_urlname(_('System'), 'icon-cog', 'system:index', 100) + cfg.main_menu.add_urlname(_('System'), 'glyphicon-cog', 'system:index', 100) def index(request): diff --git a/plinth/modules/tor/tor.py b/plinth/modules/tor/tor.py index 76e760b83..9c2fa4308 100644 --- a/plinth/modules/tor/tor.py +++ b/plinth/modules/tor/tor.py @@ -39,7 +39,7 @@ class TorForm(forms.Form): # pylint: disable=W0232 def init(): """Initialize the Tor module""" menu = cfg.main_menu.get('apps:index') - menu.add_urlname('Tor', 'icon-eye-close', 'tor:index', 30) + menu.add_urlname('Tor', 'glyphicon-eye-close', 'tor:index', 30) @login_required diff --git a/plinth/modules/users/users.py b/plinth/modules/users/users.py index aef303970..64ad182b9 100644 --- a/plinth/modules/users/users.py +++ b/plinth/modules/users/users.py @@ -20,7 +20,7 @@ LOGGER = logging.getLogger(__name__) def init(): """Intialize the module""" menu = cfg.main_menu.get('system:index') - menu.add_urlname(_('Users and Groups'), 'icon-user', 'users:index', 15) + menu.add_urlname(_('Users and Groups'), 'glyphicon-user', 'users:index', 15) @login_required diff --git a/plinth/modules/xmpp/xmpp.py b/plinth/modules/xmpp/xmpp.py index ae7ef1afb..a107e8a5a 100644 --- a/plinth/modules/xmpp/xmpp.py +++ b/plinth/modules/xmpp/xmpp.py @@ -33,8 +33,8 @@ SIDE_MENU = { def init(): """Initialize the XMPP module""" menu = cfg.main_menu.get('apps:index') - menu.add_item('Chat', 'icon-comment', '/../jwchat', 20) - menu.add_urlname('XMPP', 'icon-comment', 'xmpp:index', 40) + menu.add_item('Chat', 'glyphicon-comment', '/../jwchat', 20) + menu.add_urlname('XMPP', 'glyphicon-comment', 'xmpp:index', 40) service.Service( 'xmpp-client', _('Chat Server - client connections'), diff --git a/plinth/templates/base.html b/plinth/templates/base.html index c5c142875..427c5418f 100644 --- a/plinth/templates/base.html +++ b/plinth/templates/base.html @@ -24,8 +24,6 @@ - - {% if title %} {{ title }} {% else %} FreedomBox {% endif %} @@ -40,75 +38,72 @@ - - - + - - {{ css|safe }} - + {% block app_head %}{% endblock %} {% block page_head %}{% endblock %} -
-
-
- - - - - - - FreedomBox - - FreedomBox - {% block add_nav_and_login %} -
- +
+
-
-
- {% if submenu or sidebar_right or sidebar_left %} -
+
+
+ {% if submenu or sidebar_right or sidebar_left %} +
{% if submenu %}
{% include "menu.html" with menu=submenu %} @@ -116,9 +111,9 @@ {% endif %} {% if sidebar_left %}
- {{ sidebar_left|safe }} + {{ sidebar_left|safe }}
- {% endif %} + {% endif %} {% block sidebar_right_block %} {% if sidebar_right %}
@@ -127,51 +122,51 @@ {% endif %} {% endblock %}
- {% endif %} -
-
-

- {% block title_block %} - {{ title }} - {% endblock %} -

+ {% endif %} +
+
+

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

- {% include 'messages.html' %} + {% include 'messages.html' %} - {% block main_block %} - {{ main|safe }} - {% endblock %} -
-
-
+ {% block main_block %} + {{ main|safe }} + {% endblock %} +
+
+
-
+
- + -
+
- - - - - - - + + + + + + + - {% block js_block %} - {{ js|safe }} - {% endblock %} - {% block app_js %}{% endblock %} - {% block page_js %}{% endblock %} + {% block js_block %} + {{ js|safe }} + {% endblock %} + {% block app_js %}{% endblock %} + {% block page_js %}{% endblock %} diff --git a/plinth/templates/menu.html b/plinth/templates/menu.html index 629ed6cdd..fd106e891 100644 --- a/plinth/templates/menu.html +++ b/plinth/templates/menu.html @@ -17,18 +17,18 @@ # {% endcomment %} -
    +
    • Menu
      • {% for item in menu.items %} {% if item.url in active_menu_urls %}
    • - + {% else %}
    • - + {% endif %} {{ item.label }} diff --git a/setup.py b/setup.py index 453cc2cfc..b9f021393 100755 --- a/setup.py +++ b/setup.py @@ -97,7 +97,8 @@ setuptools.setup( install_requires=[ 'cherrypy >= 3.0', 'django >= 1.7.0', - 'django-bootstrap-form' + 'django-bootstrap-form', + 'libjs-bootstrap >= 3.2.0', ], include_package_data=True, package_data={'plinth': ['templates/*', diff --git a/static/themes/default/bootstrap b/static/themes/default/bootstrap new file mode 120000 index 000000000..d17ad3f59 --- /dev/null +++ b/static/themes/default/bootstrap @@ -0,0 +1 @@ +/usr/share/javascript/bootstrap/ \ No newline at end of file diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css index 7d72fe909..c6f2d645d 100644 --- a/static/themes/default/css/plinth.css +++ b/static/themes/default/css/plinth.css @@ -1,59 +1,37 @@ -@media (min-width: 979px) { - body { - padding-top: 60px; - } -} - body { - padding-bottom: 40px; + padding-top: 60px; + padding-bottom: 20px; } -.sidebar-nav { - padding: 9px 0; +.sidebar-nav .nav li a { + padding: 2px 15px; } -.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-header is deprecated in bootstrap 3.x, so replicate it here */ +.nav-header { + text-transform: uppercase; + font-weight: bold; + font-size: 11px; + display: block; + color: #999; } .nav-icon { - margin-right: 8px; + margin-right: 8px; } +.navbar .container { + width: 100%; +} .sidenav-icon { - margin-right: 8px; - padding-right: 5px; + margin-right: 8px; + padding-right: 5px; } -.table-autowidth { - width: auto; -} - -.table td.cell-indented { - padding-left: 3em; +.navbar-brand img { + float: left; + margin-top: -14px; + padding: 8px; } .running-status {