From 6a1f96d7c2317fb1847df332e7dc1a719d40f094 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sun, 23 Nov 2014 14:08:13 +0530 Subject: [PATCH] Bootstrap change .btn-primary -> .btn .btn-primary Only then the full intended style will apply. This is a change from Bootstrap 2 to Bootstrap 3. --- plinth/modules/config/templates/config.html | 2 +- plinth/modules/expert_mode/templates/expert_mode.html | 2 +- plinth/modules/first_boot/templates/firstboot_state0.html | 2 +- plinth/modules/owncloud/templates/owncloud.html | 2 +- plinth/modules/packages/templates/packages.html | 2 +- plinth/modules/pagekite/templates/pagekite_configure.html | 2 +- plinth/modules/tor/templates/tor.html | 3 +-- plinth/modules/users/templates/users_add.html | 2 +- plinth/modules/users/templates/users_edit.html | 2 +- plinth/modules/xmpp/templates/xmpp_configure.html | 2 +- plinth/modules/xmpp/templates/xmpp_register.html | 3 ++- plinth/templates/form.html | 2 +- plinth/templates/login.html | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plinth/modules/config/templates/config.html b/plinth/modules/config/templates/config.html index 9f4e4f68a..ea4ed51a3 100644 --- a/plinth/modules/config/templates/config.html +++ b/plinth/modules/config/templates/config.html @@ -29,7 +29,7 @@ {{ form|bootstrap }} - + diff --git a/plinth/modules/expert_mode/templates/expert_mode.html b/plinth/modules/expert_mode/templates/expert_mode.html index 8e447ffbb..4f2bc1dec 100644 --- a/plinth/modules/expert_mode/templates/expert_mode.html +++ b/plinth/modules/expert_mode/templates/expert_mode.html @@ -42,7 +42,7 @@ {{ form|bootstrap }} - + diff --git a/plinth/modules/first_boot/templates/firstboot_state0.html b/plinth/modules/first_boot/templates/firstboot_state0.html index d55c70756..b48e89ba1 100644 --- a/plinth/modules/first_boot/templates/firstboot_state0.html +++ b/plinth/modules/first_boot/templates/firstboot_state0.html @@ -36,7 +36,7 @@
{% csrf_token %} {{ form|bootstrap }} - +
diff --git a/plinth/modules/owncloud/templates/owncloud.html b/plinth/modules/owncloud/templates/owncloud.html index a06103df6..3a93fa886 100644 --- a/plinth/modules/owncloud/templates/owncloud.html +++ b/plinth/modules/owncloud/templates/owncloud.html @@ -36,7 +36,7 @@ 5 minutes or more, depending on download bandwidth from the Debian APT sources.

- + diff --git a/plinth/modules/packages/templates/packages.html b/plinth/modules/packages/templates/packages.html index 90dd247a6..03ae6a545 100644 --- a/plinth/modules/packages/templates/packages.html +++ b/plinth/modules/packages/templates/packages.html @@ -38,7 +38,7 @@

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

- + diff --git a/plinth/modules/pagekite/templates/pagekite_configure.html b/plinth/modules/pagekite/templates/pagekite_configure.html index e8544420b..5de3f3188 100644 --- a/plinth/modules/pagekite/templates/pagekite_configure.html +++ b/plinth/modules/pagekite/templates/pagekite_configure.html @@ -48,7 +48,7 @@ {% include 'bootstrapform/field.html' with field=form.ssh_enabled %} - + diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html index 1afeaf6a2..5a7393d1d 100644 --- a/plinth/modules/tor/templates/tor.html +++ b/plinth/modules/tor/templates/tor.html @@ -47,10 +47,9 @@ Here is the current configuration: {{ form|bootstrap }} - + -

Bridge

Your {{ cfg.box_name }} is configured as a Tor bridge with obfsproxy, so it can help circumvent censorship. If your {{ cfg.box_name }} is behind a router diff --git a/plinth/modules/users/templates/users_add.html b/plinth/modules/users/templates/users_add.html index 1be72d630..703e2c8f4 100644 --- a/plinth/modules/users/templates/users_add.html +++ b/plinth/modules/users/templates/users_add.html @@ -27,7 +27,7 @@ {{ form|bootstrap }} - + diff --git a/plinth/modules/users/templates/users_edit.html b/plinth/modules/users/templates/users_edit.html index 4c695679b..2359e3e11 100644 --- a/plinth/modules/users/templates/users_edit.html +++ b/plinth/modules/users/templates/users_edit.html @@ -27,7 +27,7 @@ {{ form|bootstrap }} - + diff --git a/plinth/modules/xmpp/templates/xmpp_configure.html b/plinth/modules/xmpp/templates/xmpp_configure.html index 38c898cbf..0101ca830 100644 --- a/plinth/modules/xmpp/templates/xmpp_configure.html +++ b/plinth/modules/xmpp/templates/xmpp_configure.html @@ -27,7 +27,7 @@ {{ form|bootstrap }} - + diff --git a/plinth/modules/xmpp/templates/xmpp_register.html b/plinth/modules/xmpp/templates/xmpp_register.html index 9b0620aeb..10a33fd3b 100644 --- a/plinth/modules/xmpp/templates/xmpp_register.html +++ b/plinth/modules/xmpp/templates/xmpp_register.html @@ -27,7 +27,8 @@ {{ form|bootstrap }} - + diff --git a/plinth/templates/form.html b/plinth/templates/form.html index 5970c1919..22b069324 100644 --- a/plinth/templates/form.html +++ b/plinth/templates/form.html @@ -27,7 +27,7 @@ {{ form|bootstrap }} - diff --git a/plinth/templates/login.html b/plinth/templates/login.html index 7ae2a39be..0399d8642 100644 --- a/plinth/templates/login.html +++ b/plinth/templates/login.html @@ -31,7 +31,7 @@ - +