[Pkg-mozext-commits] [requestpolicy] 10/100: Update styling of add rule form.
David Prévot
taffit at moszumanska.debian.org
Fri Dec 12 22:56:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit a0099478b3ee70ed4ee6b884fe00acc49805839c
Author: Christopher Bura <christopher.bura at gmail.com>
Date: Tue Sep 2 06:05:58 2014 -0400
Update styling of add rule form.
---
src/content/settings/settings.css | 80 +++++++++++++++++--------
src/content/settings/yourpolicy.html | 98 ++++++++++++++++---------------
src/content/settings/yourpolicy.js | 3 +-
src/locale/de/requestpolicy.properties | 1 +
src/locale/en-US/requestpolicy.properties | 1 +
src/locale/eo/requestpolicy.properties | 1 +
src/locale/es-MX/requestpolicy.properties | 1 +
src/locale/eu/requestpolicy.properties | 1 +
src/locale/fr/requestpolicy.properties | 1 +
src/locale/it/requestpolicy.properties | 1 +
src/locale/ja/requestpolicy.properties | 1 +
src/locale/ko-KR/requestpolicy.properties | 1 +
src/locale/lv-LV/requestpolicy.properties | 1 +
src/locale/nl/requestpolicy.properties | 1 +
src/locale/pt-BR/requestpolicy.properties | 1 +
src/locale/ru-RU/requestpolicy.properties | 1 +
src/locale/sk-SK/requestpolicy.properties | 1 +
src/locale/sv-SE/requestpolicy.properties | 1 +
src/locale/tr/requestpolicy.properties | 1 +
src/locale/uk-UA/requestpolicy.properties | 1 +
src/locale/zh-CN/requestpolicy.properties | 1 +
src/locale/zh-TW/requestpolicy.properties | 1 +
22 files changed, 127 insertions(+), 73 deletions(-)
diff --git a/src/content/settings/settings.css b/src/content/settings/settings.css
index e7c0a30..8afc7a7 100644
--- a/src/content/settings/settings.css
+++ b/src/content/settings/settings.css
@@ -150,47 +150,74 @@ table.settings tr:not(:first-child) {
margin-top: 10px;
}
+#defaultpolicyword {
+ font-weight: bold;
+}
+
+#subscriptionschanged {
+ margin-top: 20px;
+}
+
+/* yourpolicy.html */
+
#addrule {
- border: 1px solid #ddd;
- border-radius: 4px;
- padding: 20px;
- background-color: #fcfcfc;
+ background-color: #F7F7F7;
+ padding: 10px;
+ margin-bottom: 30px;
}
-#addrule table {
- width : auto;
- margin-top: 10px;
- margin-bottom: 10px;
+
+#addrule ul {
+ list-style: none;
+ padding: 0;
+ margin: 0;
}
-#addrule .origindest {
- padding-right: 10px;
+
+#addrule ul li {
+ padding: 5px;
+ margin-left: 10px;
}
-#addrule .scheme input {
- width: 5em;
+
+#addrule input[type="text"] {
+ border: 1px solid #ddd;
+ padding: 5px;
}
-#addrule .host input {
- width: 15em;
+
+#addrule .input-label {
+ font-weight: bold;
+ margin-left: 0;
}
-#addrule .port input {
- width: 3em;
+
+#addrule .rule-type {
+ font-weight: bold;
}
+
#addrule p {
- margin-top: 20px;
- margin-bottom: 0;
+ padding-left: 5px;
+ float: right;
}
-#defaultpolicyword {
+#addrule a {
+ color: #35c;
font-weight: bold;
+ text-decoration: none;
}
-#subscriptionschanged {
- margin-top: 20px;
+#addrule button {
+ width: 25%;
}
-/* yourpolicy.html */
-
#policysearch {
text-align: right;
- color: #A6B2A9;
+ font-weight: bold;
+ margin-bottom: 10px;
+ background-color: #F7F7F7;
+ padding: 10px;
+}
+
+#policysearch input {
+ padding: 5px;
+ border: 1px solid #ddd;
+ width: 25%;
}
#policy-user {
@@ -260,3 +287,8 @@ a.deleterule {
.block {
color: #7F0000;
}
+
+.yourpolicy h2 {
+ border-bottom: 2px solid #E2E5EE;
+ padding-bottom: 5px;
+}
diff --git a/src/content/settings/yourpolicy.html b/src/content/settings/yourpolicy.html
index 93c0127..86ce0a8 100644
--- a/src/content/settings/yourpolicy.html
+++ b/src/content/settings/yourpolicy.html
@@ -36,6 +36,56 @@
<div id="contentcontainer" class="yourpolicy">
<div id="pagetitle" data-string="yourPolicy"></div>
+ <h2>Create Rule</h2>
+ <div id="addrule">
+ <p>
+ <a href="https://www.requestpolicy.com/help-rules.html" target="_blank" data-string="learnMoreAboutRules"></a>
+ </p>
+ <form id="addruleform" onsubmit="return false;">
+ <ul>
+ <li class="input-label">
+ <label data-string="ruleType"></label>
+ </li>
+ <li class="rule-type">
+ <label class="allow">
+ <span data-string="allow"></span>
+ <input type="radio" name="allowdeny" id="allowrule" value="allow" checked="checked"/>
+ </label>
+ <label class="block">
+ <span data-string="block"></span>
+ <input type="radio" name="allowdeny" id="denyrule" value="deny"/>
+ </label>
+ </li>
+ <li class="input-label">
+ <label data-string="origin"></label>
+ </li>
+ <li>
+ <input type="text" name="originscheme"/>
+ <input type="text" name="originhost"/>
+ <input type="text" name="originport"/>
+ </li>
+ <li class="input-label">
+ <label data-string="destination"></label>
+ </li>
+ <li>
+ <input type="text" name="destscheme"/>
+ <input type="text" name="desthost"/>
+ <input type="text" name="destport"/>
+ </li>
+ <li class="input-label">
+ <label for="temporary" data-string="temporary"></label>
+ <input type="checkbox" name="temporary" id="temporary" />
+ </li>
+ <li class="input-label">
+ <button onclick="addRule();" data-string="addRule"></button>
+ </li>
+ </ul>
+ </form>
+
+ </div>
+
+ <h2>Active Rules</h2>
+
<div>
<div class="policyheader">
<div id="policysearch">
@@ -68,54 +118,6 @@
</div>
<style>
- #addrule {
- margin-top: 20px;
- }
- input {
- font-size: 1em;
- }
- </style>
-
- <div id="addrule">
-
- <form id="addruleform" onsubmit="return false;">
- <label>
- <input type="radio" name="allowdeny" id="allowrule" value="allow"
- checked="checked"/>
- <span data-string="allow"></span>
- </label>
- <br/>
- <label>
- <input type="radio" name="allowdeny" id="denyrule" value="deny"/>
- <span data-string="block"></span>
- </label>
- <br/>
- <label>
- <input type="checkbox" name="temporary" />
- <span data-string="temporary"></span>
- </label>
- <table>
- <tr>
- <td class="origindest" data-string="origin"></td>
- <td class="scheme"><input type="text" name="originscheme"/></td>
- <td class="host"><input type="text" name="originhost"/></td>
- <td class="port"><input type="text" name="originport"/></td>
- </tr>
- <tr>
- <td class="origindest" data-string="destination"></td>
- <td class="scheme"><input type="text" name="destscheme"/></td>
- <td class="host"><input type="text" name="desthost"/></td>
- <td class="port"><input type="text" name="destport"/></td>
- </tr>
- </table>
- <button onclick="addRule();" data-string="addRule"></button>
- </form>
-
- <p><a href="https://www.requestpolicy.com/help-rules.html"
- target="_blank" data-string="learnMoreAboutRules"></a></p>
- </div>
-
- <style>
#oldrulesexist {
margin-top: 20px;
margin-bottom: 10px;
diff --git a/src/content/settings/yourpolicy.js b/src/content/settings/yourpolicy.js
index f424a2b..56378f3 100644
--- a/src/content/settings/yourpolicy.js
+++ b/src/content/settings/yourpolicy.js
@@ -13,7 +13,8 @@ PAGE_STRINGS = [
'removeOldRules',
'source',
'highlightRules',
- 'filterRules'
+ 'filterRules',
+ 'ruleType'
];
$(function () {
diff --git a/src/locale/de/requestpolicy.properties b/src/locale/de/requestpolicy.properties
index 9eeb7a6..d47c999 100644
--- a/src/locale/de/requestpolicy.properties
+++ b/src/locale/de/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/en-US/requestpolicy.properties b/src/locale/en-US/requestpolicy.properties
index c9c4ee1..5c9d053 100644
--- a/src/locale/en-US/requestpolicy.properties
+++ b/src/locale/en-US/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/eo/requestpolicy.properties b/src/locale/eo/requestpolicy.properties
index a3b3736..b929f96 100644
--- a/src/locale/eo/requestpolicy.properties
+++ b/src/locale/eo/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/es-MX/requestpolicy.properties b/src/locale/es-MX/requestpolicy.properties
index 212170d..789bc0d 100644
--- a/src/locale/es-MX/requestpolicy.properties
+++ b/src/locale/es-MX/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/eu/requestpolicy.properties b/src/locale/eu/requestpolicy.properties
index ca4fb25..609bdca 100644
--- a/src/locale/eu/requestpolicy.properties
+++ b/src/locale/eu/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/fr/requestpolicy.properties b/src/locale/fr/requestpolicy.properties
index 36ac83e..394b3c6 100644
--- a/src/locale/fr/requestpolicy.properties
+++ b/src/locale/fr/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/it/requestpolicy.properties b/src/locale/it/requestpolicy.properties
index 3c38192..02ca133 100644
--- a/src/locale/it/requestpolicy.properties
+++ b/src/locale/it/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/ja/requestpolicy.properties b/src/locale/ja/requestpolicy.properties
index 8731c07..2a9c3cf 100644
--- a/src/locale/ja/requestpolicy.properties
+++ b/src/locale/ja/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/ko-KR/requestpolicy.properties b/src/locale/ko-KR/requestpolicy.properties
index f4cc018..a605414 100644
--- a/src/locale/ko-KR/requestpolicy.properties
+++ b/src/locale/ko-KR/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/lv-LV/requestpolicy.properties b/src/locale/lv-LV/requestpolicy.properties
index 67408ee..a3c1b7d 100644
--- a/src/locale/lv-LV/requestpolicy.properties
+++ b/src/locale/lv-LV/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/nl/requestpolicy.properties b/src/locale/nl/requestpolicy.properties
index 8c4bddd..b11b27c 100644
--- a/src/locale/nl/requestpolicy.properties
+++ b/src/locale/nl/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/pt-BR/requestpolicy.properties b/src/locale/pt-BR/requestpolicy.properties
index 47c432e..b013baa 100644
--- a/src/locale/pt-BR/requestpolicy.properties
+++ b/src/locale/pt-BR/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/ru-RU/requestpolicy.properties b/src/locale/ru-RU/requestpolicy.properties
index 444c975..cc00622 100644
--- a/src/locale/ru-RU/requestpolicy.properties
+++ b/src/locale/ru-RU/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/sk-SK/requestpolicy.properties b/src/locale/sk-SK/requestpolicy.properties
index 7935c70..7bb828b 100644
--- a/src/locale/sk-SK/requestpolicy.properties
+++ b/src/locale/sk-SK/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/sv-SE/requestpolicy.properties b/src/locale/sv-SE/requestpolicy.properties
index f7df7a3..dbd103a 100644
--- a/src/locale/sv-SE/requestpolicy.properties
+++ b/src/locale/sv-SE/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/tr/requestpolicy.properties b/src/locale/tr/requestpolicy.properties
index 789da47..c7cdf17 100644
--- a/src/locale/tr/requestpolicy.properties
+++ b/src/locale/tr/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/uk-UA/requestpolicy.properties b/src/locale/uk-UA/requestpolicy.properties
index a3307a5..3e7f3d4 100644
--- a/src/locale/uk-UA/requestpolicy.properties
+++ b/src/locale/uk-UA/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/zh-CN/requestpolicy.properties b/src/locale/zh-CN/requestpolicy.properties
index 7bce560..46370b6 100644
--- a/src/locale/zh-CN/requestpolicy.properties
+++ b/src/locale/zh-CN/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=旧规则已删除.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
diff --git a/src/locale/zh-TW/requestpolicy.properties b/src/locale/zh-TW/requestpolicy.properties
index 28de510..b72c1d3 100644
--- a/src/locale/zh-TW/requestpolicy.properties
+++ b/src/locale/zh-TW/requestpolicy.properties
@@ -105,3 +105,4 @@ yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
source=Source
highlightRules=Highlight Rules
filterRules=Filter Rules
+ruleType=Rule Type
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list