[Pkg-mozext-commits] [requestpolicy] 15/100: Coding style changes

David Prévot taffit at moszumanska.debian.org
Fri Dec 12 22:56:48 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 d23c19c0d59ec671fcf8acd499517a2c7557f7ea
Author: Christopher Bura <christopher.bura at gmail.com>
Date:   Tue Sep 9 13:56:45 2014 -0400

    Coding style changes
    
    See
    https://github.com/RequestPolicyContinued/requestpolicy/pull/459#issuecomment-54956628
---
 src/content/settings/settings.css         |  4 ++--
 src/content/settings/yourpolicy.html      | 13 +++++++++---
 src/content/settings/yourpolicy.js        | 34 +++++++++++++++----------------
 src/locale/de/requestpolicy.properties    |  4 ++--
 src/locale/en-US/requestpolicy.properties |  4 ++--
 src/locale/eo/requestpolicy.properties    |  4 ++--
 src/locale/es-MX/requestpolicy.properties |  4 ++--
 src/locale/eu/requestpolicy.properties    |  4 ++--
 src/locale/fr/requestpolicy.properties    |  4 ++--
 src/locale/it/requestpolicy.properties    |  4 ++--
 src/locale/ja/requestpolicy.properties    |  4 ++--
 src/locale/ko-KR/requestpolicy.properties |  4 ++--
 src/locale/lv-LV/requestpolicy.properties |  4 ++--
 src/locale/nl/requestpolicy.properties    |  4 ++--
 src/locale/pt-BR/requestpolicy.properties |  4 ++--
 src/locale/ru-RU/requestpolicy.properties |  4 ++--
 src/locale/sk-SK/requestpolicy.properties |  4 ++--
 src/locale/sv-SE/requestpolicy.properties |  4 ++--
 src/locale/tr/requestpolicy.properties    |  4 ++--
 src/locale/uk-UA/requestpolicy.properties |  4 ++--
 src/locale/zh-CN/requestpolicy.properties |  4 ++--
 src/locale/zh-TW/requestpolicy.properties |  4 ++--
 22 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/src/content/settings/settings.css b/src/content/settings/settings.css
index 933c01f..9766201 100644
--- a/src/content/settings/settings.css
+++ b/src/content/settings/settings.css
@@ -238,8 +238,8 @@ table.settings tr:not(:first-child) {
   word-wrap: break-word;
 }
 
-#policy-user tbody tr td:nth-child(2),
-#policy-user tbody tr td:nth-child(3) {
+#policy-user col.origin,
+#policy-user col.destination {
   width: 50%;
 }
 
diff --git a/src/content/settings/yourpolicy.html b/src/content/settings/yourpolicy.html
index 9c1c815..0360ba4 100644
--- a/src/content/settings/yourpolicy.html
+++ b/src/content/settings/yourpolicy.html
@@ -44,7 +44,7 @@
             <form id="addruleform" onsubmit="return false;">
               <ul>
                 <li class="input-label">
-                  <label data-string="ruleType"></label>
+                  <label data-string="policy"></label>
                 </li>
                 <li class="rule-type">
                   <label class="allow">
@@ -95,12 +95,19 @@
           </div>
           <div class="policydata">
             <table id="policy-user">
+              <colgroup>
+                <col class="type">
+                <col class="origin">
+                <col class="destination">
+                <col class="ruleset">
+                <col class="remove">
+              </colgroup>
               <thead>
                 <tr>
-                  <th data-string="type"></th>
+                  <th data-string="policy"></th>
                   <th data-string="origin"></th>
                   <th data-string="destination"></th>
-                  <th data-string="policyList"></th>
+                  <th data-string="ruleSet"></th>
                   <th data-string="remove"></th>
                 </tr>
               </thead>
diff --git a/src/content/settings/yourpolicy.js b/src/content/settings/yourpolicy.js
index 9015dd3..4d3ecaa 100644
--- a/src/content/settings/yourpolicy.js
+++ b/src/content/settings/yourpolicy.js
@@ -11,9 +11,9 @@ PAGE_STRINGS = [
   'addRule',
   'learnMoreAboutRules',
   'removeOldRules',
-  'policyList',
+  'ruleSet',
   'filterRules',
-  'ruleType'
+  'policy'
 ];
 
 $(function () {
@@ -52,21 +52,21 @@ function populateRuleTable(filter) {
   addPolicies(entries, 'Temporary', filter, false);
 
   // Get and display subscription policies
-  var subscription_lists = policyMgr._subscriptionPolicies;
-  for (subscription_list in subscription_lists) {
-    for (subscription in subscription_lists[subscription_list]) {
-      entries = subscription_lists[subscription_list][subscription].rawPolicy.toJSON()['entries'];
+  var subscriptionLists = policyMgr._subscriptionPolicies;
+  for (subscriptionList in subscriptionLists) {
+    for (subscription in subscriptionLists[subscriptionList]) {
+      entries = subscriptionLists[subscriptionList][subscription].rawPolicy.toJSON()['entries'];
       addPolicies(entries, subscription, filter, true);
     }
   }
 
 }
 
-function addPolicies(entries, source, filter, read_only) {
+function addPolicies(entries, source, filter, readOnly) {
   var table = $('#rules');
-  for (var entry_type in entries) {
-    for (var i = 0; i < entries[entry_type].length; i++) {
-      var entry = entries[entry_type][i];
+  for (var entryType in entries) {
+    for (var i = 0; i < entries[entryType].length; i++) {
+      var entry = entries[entryType][i];
       var origin = entry['o'] ? ruleDataPartToDisplayString(entry['o']) : '';
       var dest = entry['d'] ? ruleDataPartToDisplayString(entry['d']) : '';
       if (filter) {
@@ -74,7 +74,7 @@ function addPolicies(entries, source, filter, read_only) {
           continue;
         }
       }
-      addPolicyTableRow(table, entry_type, origin, dest, entry, source, read_only);
+      addPolicyTableRow(table, entryType, origin, dest, entry, source, readOnly);
     }
   }
 }
@@ -99,21 +99,21 @@ function clearPolicyTable(table) {
   }
 }
 
-function addPolicyTableRow(table, type, origin, dest, ruleData, source, read_only) {
+function addPolicyTableRow(table, type, origin, dest, ruleData, source, readOnly) {
 
-  var type_class = type == 'allow' ? 'allow' : 'block';
-  var rule_type = type == 'allow' ? _('allow') : _('block');
+  var typeClass = type == 'allow' ? 'allow' : 'block';
+  var ruleType = type == 'allow' ? _('allow') : _('block');
 
-  var row = $('<tr>').addClass(type_class).appendTo(table);
+  var row = $('<tr>').addClass(typeClass).appendTo(table);
 
   row.append(
-    $('<td>').text(rule_type),
+    $('<td>').text(ruleType),
     $('<td>').text(origin),
     $('<td>').text(dest),
     $('<td>').text(source)
   );
 
-  if (!read_only) {
+  if (!readOnly) {
     var anchor = $('<a>');
     anchor.text('x').addClass('deleterule');
     anchor.data('requestpolicyRuleType', type);
diff --git a/src/locale/de/requestpolicy.properties b/src/locale/de/requestpolicy.properties
index 00b1809..55cc5fb 100644
--- a/src/locale/de/requestpolicy.properties
+++ b/src/locale/de/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/en-US/requestpolicy.properties b/src/locale/en-US/requestpolicy.properties
index d693051..8edf273 100644
--- a/src/locale/en-US/requestpolicy.properties
+++ b/src/locale/en-US/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/eo/requestpolicy.properties b/src/locale/eo/requestpolicy.properties
index 4a2eddf..6054be6 100644
--- a/src/locale/eo/requestpolicy.properties
+++ b/src/locale/eo/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/es-MX/requestpolicy.properties b/src/locale/es-MX/requestpolicy.properties
index 932c762..95f9a30 100644
--- a/src/locale/es-MX/requestpolicy.properties
+++ b/src/locale/es-MX/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/eu/requestpolicy.properties b/src/locale/eu/requestpolicy.properties
index 3c83c7a..d6f452f 100644
--- a/src/locale/eu/requestpolicy.properties
+++ b/src/locale/eu/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/fr/requestpolicy.properties b/src/locale/fr/requestpolicy.properties
index c1175fb..d0c9974 100644
--- a/src/locale/fr/requestpolicy.properties
+++ b/src/locale/fr/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/it/requestpolicy.properties b/src/locale/it/requestpolicy.properties
index 2c7bc97..d45652e 100644
--- a/src/locale/it/requestpolicy.properties
+++ b/src/locale/it/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/ja/requestpolicy.properties b/src/locale/ja/requestpolicy.properties
index 4b6850b..d6cba31 100644
--- a/src/locale/ja/requestpolicy.properties
+++ b/src/locale/ja/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/ko-KR/requestpolicy.properties b/src/locale/ko-KR/requestpolicy.properties
index 703e760..9295f92 100644
--- a/src/locale/ko-KR/requestpolicy.properties
+++ b/src/locale/ko-KR/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/lv-LV/requestpolicy.properties b/src/locale/lv-LV/requestpolicy.properties
index 4dd841f..d3f6bb0 100644
--- a/src/locale/lv-LV/requestpolicy.properties
+++ b/src/locale/lv-LV/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/nl/requestpolicy.properties b/src/locale/nl/requestpolicy.properties
index ccf12d2..a13d229 100644
--- a/src/locale/nl/requestpolicy.properties
+++ b/src/locale/nl/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/pt-BR/requestpolicy.properties b/src/locale/pt-BR/requestpolicy.properties
index e1bfe97..2a46a21 100644
--- a/src/locale/pt-BR/requestpolicy.properties
+++ b/src/locale/pt-BR/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/ru-RU/requestpolicy.properties b/src/locale/ru-RU/requestpolicy.properties
index 2aedb8a..10844a8 100644
--- a/src/locale/ru-RU/requestpolicy.properties
+++ b/src/locale/ru-RU/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/sk-SK/requestpolicy.properties b/src/locale/sk-SK/requestpolicy.properties
index 7e37b39..1ce5b4f 100644
--- a/src/locale/sk-SK/requestpolicy.properties
+++ b/src/locale/sk-SK/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/sv-SE/requestpolicy.properties b/src/locale/sv-SE/requestpolicy.properties
index 6b7576c..9f05cdd 100644
--- a/src/locale/sv-SE/requestpolicy.properties
+++ b/src/locale/sv-SE/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/tr/requestpolicy.properties b/src/locale/tr/requestpolicy.properties
index b5f87e7..e4eb7a7 100644
--- a/src/locale/tr/requestpolicy.properties
+++ b/src/locale/tr/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/uk-UA/requestpolicy.properties b/src/locale/uk-UA/requestpolicy.properties
index 20d9d59..cff9211 100644
--- a/src/locale/uk-UA/requestpolicy.properties
+++ b/src/locale/uk-UA/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/zh-CN/requestpolicy.properties b/src/locale/zh-CN/requestpolicy.properties
index 233a89b..564298c 100644
--- a/src/locale/zh-CN/requestpolicy.properties
+++ b/src/locale/zh-CN/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=导入旧规则
 deleteOldRules=删除旧规则
 showOldRuleReimportOptions=显示重新导入选项
 yourOldRulesHaveBeenDeleted=旧规则已删除.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy
diff --git a/src/locale/zh-TW/requestpolicy.properties b/src/locale/zh-TW/requestpolicy.properties
index 75d175c..7f05cab 100644
--- a/src/locale/zh-TW/requestpolicy.properties
+++ b/src/locale/zh-TW/requestpolicy.properties
@@ -102,6 +102,6 @@ importOldRules=Import Old Rules
 deleteOldRules=Delete old rules
 showOldRuleReimportOptions=Show re-import options.
 yourOldRulesHaveBeenDeleted=Done! Your old rules have been deleted.
-policyList=Policy List
+ruleSet=Rule Set
 filterRules=Filter Rules
-ruleType=Rule Type
+policy=Policy

-- 
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