Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3005)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/policy.html

Issue 7828042: Implemented status section functionality for about:policy. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: . Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/policy/configuration_policy_reader.h ('K') | « chrome/browser/resources/policy.css ('k') | chrome/browser/resources/policy.js » ('j') | chrome/browser/resources/policy.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/policy.html
diff --git a/chrome/browser/resources/policy.html b/chrome/browser/resources/policy.html
index db547b42f70ff34458f456f40163c63f4444c4f2..ccac57d4dbe54dd637b8e90b97ada3476f53ea5d 100644
--- a/chrome/browser/resources/policy.html
+++ b/chrome/browser/resources/policy.html
@@ -5,52 +5,78 @@
<title i18n-content="policyTitle"></title>
<link rel="stylesheet" href="chrome://resources/css/button.css">
<link rel="stylesheet" href="policy.css">
-<script src="chrome://policy/strings.js"></script>
-<script src="chrome://resources/js/cr.js"></script>
-<script src="chrome://resources/js/cr/ui.js"></script>
-<script src="chrome://resources/js/local_strings.js"></script>
-<script src="chrome://resources/js/i18n_template.js"></script>
-<script src="chrome://resources/js/i18n_process.js"></script>
-<script src="chrome://resources/js/jstemplate_compiled.js"></script>
-<script src="chrome://resources/js/util.js"></script>
-<script src="policy.js"></script>
</head>
-<body i18n-values=".style.fontFamily:fontfamily;">
+<body i18n-values=".style.fontFamily:fontfamily; .style.fontSize:fontsize">
<div class="header">
<h1 id="about-policy-title" i18n-content="policyTitle"></h1>
</div>
<div id="main-content">
- <section id="status-section">
- <div class="separator">
- <span id="status-title" i18n-content="statusPaneTitle"></span>
- <div id="fetch-policies">
- <button id="fetch-policies-button" i18n-content="fetchPoliciesText">
- </button>
+ <div id="dataTemplate">
James Hawkins 2011/09/05 22:10:38 IDs should be dash-form.
simo 2011/09/07 12:18:16 Done.
+ <section id="status-section" jsselect="status"
+ style="display: none" jsdisplay="displayStatusSection">
James Hawkins 2011/09/05 22:10:38 Don't specify style in HTML.
simo 2011/09/07 12:18:16 Done.
+ <div class="separator">
+ <span id="status-title" i18n-content="statusPaneTitle"></span>
+ <div id="fetch-policies">
+ <button id="fetch-policies-button" i18n-content="fetchPoliciesText">
+ </button>
+ </div>
</div>
- </div>
- <div id="status-pane">
- <fieldset class="status-box">
- <legend i18n-content="devicePoliciesBoxTitle"></legend>
- <ul>
- <li i18n-content="enrollmentDomainText"></li>
- <li i18n-content="lastFetchedText"></li>
- <li i18n-content="fetchIntervalText"></li>
- <li i18n-content="serverStatusText"></li>
- </ul>
- </fieldset>
- <fieldset class="status-box">
- <legend i18n-content="userPoliciesBoxTitle"></legend>
- <ul>
- <li i18n-content="enrollmentDomainText"></li>
- <li i18n-content="lastFetchedText"></li>
- <li i18n-content="fetchIntervalText"></li>
- <li i18n-content="serverStatusText"></li>
- </ul>
- </fielset>
- </div>
- </section>
- <section id="policies-section">
- <div id="policiesTemplate">
+ <div id="status-pane">
+ <fieldset class="status-box">
+ <legend i18n-content="devicePoliciesBoxTitle"></legend>
+ <ul>
+ <li>
+ <span i18n-content="enrollmentDomainText"></span>
+ <span jscontent="devicePolicyDomain"></span>
+ </li>
+ <li>
+ <span i18n-content="clientIdText"></span>
+ <span jscontent="deviceId"></span>
+ </li>
+ <li>
+ <span i18n-content="lastFetchedText"></span>
+ <span id="device-last-fetch-time"
+ jscontent="deviceLastFetchTime"></span>
James Hawkins 2011/09/05 22:10:38 Wrapped lines should be 4 space indented from the
simo 2011/09/07 12:18:16 Done.
+ </li>
+ <li>
+ <span i18n-content="fetchIntervalText"></span>
+ <span jscontent="deviceFetchInterval"></span>
+ </li>
+ <li>
+ <span i18n-content="serverStatusText"></span>
+ <span jscontent="deviceStatusMessage"></span>
+ </li>
+ </ul>
+ </fieldset>
+ <fieldset class="status-box">
+ <legend i18n-content="userPoliciesBoxTitle"></legend>
+ <ul>
+ <li>
+ <span i18n-content="usernameText"></span>
+ <span jscontent="user"></span>
+ </li>
+ <li>
+ <span i18n-content="clientIdText"></span>
+ <span jscontent="userId"></span>
+ </li>
+ <li>
+ <span i18n-content="lastFetchedText"></span>
+ <span id="user-last-fetch-time"
+ jscontent="userLastFetchTime"></span>
+ </li>
+ <li>
+ <span i18n-content="fetchIntervalText"></span>
+ <span jscontent="userFetchInterval"></span>
+ </li>
+ <li>
+ <span i18n-content="serverStatusText"></span>
+ <span jscontent="userStatusMessage"></span>
+ </li>
+ </ul>
+ </fielset>
+ </div>
+ </section>
+ <section id="policies-section">
<div class="separator">
<span id="policies-title" i18n-content="policyTitle"></span>
<div id="unsent-policies-control">
@@ -66,7 +92,8 @@
</div>
</div>
<div>
- <div id="no-policies" jsdisplay="!anyPoliciesSet">
+ <div id="no-policies" stylchre="display: none"
James Hawkins 2011/09/05 22:10:38 What is stylechre?
simo 2011/09/07 12:18:16 A typo.
+ jsdisplay="!anyPoliciesSet">
<div id="no-policies-text" i18n-content="noPoliciesSet"></div>
</div>
<div id="policies"
@@ -91,21 +118,43 @@
<td>
<span class="policy-level" jscontent="level"></span>
</td>
- <td>
+ <td class="collapsed">
<span class="policy-name" jscontent="name"></span>
</td>
<td>
- <span class="policy-value" jscontent="value"></span>
+ <div class="text-container collapsed">
+ <span class="cellText" jscontent="value"></span>
James Hawkins 2011/09/05 22:10:38 Classes use dash-form.
simo 2011/09/07 12:18:16 Done.
+ </div>
+ <a class="toggler expand" style="display: none"
James Hawkins 2011/09/05 22:10:38 Use hidden instead of display: none.
simo 2011/09/07 12:18:16 But won't the togglers take up space when they are
+ jsdisplay="Policy.shouldShowExpand(this)"
+ i18n-content="showMoreText"></a>
+ <a class="toggler collapse" style="display: none"
+ i18n-content="hideText"></a>
</td>
<td>
- <span class="policy-status" jscontent="status"></span>
+ <div class="text-container collapsed">
+ <span class="cellText" jscontent="status"></span>
+ </div>
+ <a class="toggler expand" style="display: none"
+ jsdisplay="Policy.shouldShowExpand(this)"
+ i18n-content="showMoreText"></a>
+ <a class="toggler collapse" style="display: none"
+ i18n-content="hideText"></a>
</td>
</tr>
</table>
</div>
</div>
- </div>
- </section>
+ </section>
+ </div>
</div>
+ <script src="chrome://policy/strings.js"></script>
James Hawkins 2011/09/05 22:10:38 Why did you move these? Scripts should be sourced
simo 2011/09/07 12:18:16 Because I was looking at other html files like plu
+ <script src="chrome://resources/js/cr.js"></script>
+ <script src="chrome://resources/js/cr/ui.js"></script>
+ <script src="chrome://resources/js/i18n_template.js"></script>
+ <script src="chrome://resources/js/i18n_process.js"></script>
+ <script src="chrome://resources/js/jstemplate_compiled.js"></script>
+ <script src="chrome://resources/js/util.js"></script>
+<script src="policy.js"></script>
James Hawkins 2011/09/05 22:10:38 Indentation off.
simo 2011/09/07 12:18:16 Done.
</body>
</html>
« chrome/browser/policy/configuration_policy_reader.h ('K') | « chrome/browser/resources/policy.css ('k') | chrome/browser/resources/policy.js » ('j') | chrome/browser/resources/policy.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698