Merge from bundle.

6 files changed, 278 insertions, 278 deletions

diff --git a/ipa-server/ipa-gui/ipagui/static/css/style.css b/ipa-server/ipa-gui/ipagui/static/css/style.css
index e4a1d9f8c..9cd7fe094 100644
--- a/ipa-server/ipa-gui/ipagui/static/css/style.css
+++ b/ipa-server/ipa-gui/ipagui/static/css/style.css
@@ -1,146 +1,146 @@
-/*

- * Quick mash-up of CSS for the TG quick start page.

- */

-

-html, body {

-  color: #000;

-  background:#fff;

-  margin: 0;

-  padding: 0;

-}

-

-body {

-  min-width: 750px;

-}

-

-#page {

-  background:#ccc;   /* should be same as #sidebar */

-  margin:0 auto;

-  width:100%;

-}

-

-

-#header {

-  background:#fff;

-}

-

-#header h1 {

-  padding:5px;

-  margin:0;

-}

-

-

-#nav {

-  background:#cc0000;

-  color:#fff;

-  padding:5px;

-}

-

-#nav ul {

-  margin:0;

-  padding:0;

-  list-style:none;

-}

-

-#nav li {

-  display:inline;

-}

-

-#nav a:visited {

-  color:#fff;

-}

-#nav a:link {

-  color:#fff;

-}

-

-

-#main_content {

-  background:#fff;

-  float:right;

-  width:85%;

-  border-left: 1px solid #000;

-  padding-left: 15px;

-  padding-bottom: 15px;

-/*  color: black;

-  font-size: 127%;

-  background-color: white;

-  margin: 0 auto 0 auto;

-  padding: 10px;

-  float: left; */

-}

-

-

-#sidebar {

-  background:#ccc;  /* should be same as #page */

-  float:left;

-  width:10%;

-  /* border: 1px solid #aaa;

-  background-color: #eee;

-  margin: 0.5em;

-  padding: 1em;

-  float: left;

-  font-size: 88%; */

-}

-

-#sidebar h2 {

-  margin-top: 0;

-}

-

-#sidebar ul {

-  margin-left: 1.5em;

-  padding-left: 0;

-}

-

-

-#footer {

-  background:#fff;

-  clear:both;

-  border-top: 1px solid #000;

-  /* color: #999;

-  background-color: white;

-  padding: 10px;

-  font-size: 80%;

-  text-align: center;

-  margin: 0 auto 1em auto; */

-}

-

-

-.formsection {

-  color: #888888;

-  width: 90%;

-  font-weight: bold;

-  border-bottom: 1px solid;

-  margin: 20px 0px 20px 0px;

-}

-

-.formtable {

-  width: 90%;

-}

-

-.formtable th {

-  width: 15%;

-  text-align: right;

-}

-

-#status_block {

-  margin: 0 auto 0.5em auto;

-  padding: 15px 10px 15px 55px;

-  background: #cec URL('../images/ok.png') left center no-repeat;

-  border: 1px solid #9c9;

-  width: 450px;

-  font-size: 120%;

-  font-weight: bolder;

-}

-

-.notice {

-  margin: 0.5em auto 0.5em auto;

-  padding: 15px 10px 15px 55px;

-  width: 450px;

-  background: #eef URL('../images/info.png') left center no-repeat;

-  border: 1px solid #cce;

-}

-

-.fielderror {

-    color: red;

-    font-weight: bold;

-}

+/*
+ * Quick mash-up of CSS for the TG quick start page.
+ */
+
+html, body {
+  color: #000;
+  background:#fff;
+  margin: 0;
+  padding: 0;
+}
+
+body {
+  min-width: 750px;
+}
+
+#page {
+  background:#ccc;   /* should be same as #sidebar */
+  margin:0 auto;
+  width:100%;
+}
+
+
+#header {
+  background:#fff;
+}
+
+#header h1 {
+  padding:5px;
+  margin:0;
+}
+
+
+#nav {
+  background:#cc0000;
+  color:#fff;
+  padding:5px;
+}
+
+#nav ul {
+  margin:0;
+  padding:0;
+  list-style:none;
+}
+
+#nav li {
+  display:inline;
+}
+
+#nav a:visited {
+  color:#fff;
+}
+#nav a:link {
+  color:#fff;
+}
+
+
+#main_content {
+  background:#fff;
+  float:right;
+  width:85%;
+  border-left: 1px solid #000;
+  padding-left: 15px;
+  padding-bottom: 15px;
+/*  color: black;
+  font-size: 127%;
+  background-color: white;
+  margin: 0 auto 0 auto;
+  padding: 10px;
+  float: left; */
+}
+
+
+#sidebar {
+  background:#ccc;  /* should be same as #page */
+  float:left;
+  width:10%;
+  /* border: 1px solid #aaa;
+  background-color: #eee;
+  margin: 0.5em;
+  padding: 1em;
+  float: left;
+  font-size: 88%; */
+}
+
+#sidebar h2 {
+  margin-top: 0;
+}
+
+#sidebar ul {
+  margin-left: 1.5em;
+  padding-left: 0;
+}
+
+
+#footer {
+  background:#fff;
+  clear:both;
+  border-top: 1px solid #000;
+  /* color: #999;
+  background-color: white;
+  padding: 10px;
+  font-size: 80%;
+  text-align: center;
+  margin: 0 auto 1em auto; */
+}
+
+
+.formsection {
+  color: #888888;
+  width: 90%;
+  font-weight: bold;
+  border-bottom: 1px solid;
+  margin: 20px 0px 20px 0px;
+}
+
+.formtable {
+  width: 90%;
+}
+
+.formtable th {
+  width: 15%;
+  text-align: right;
+}
+
+#status_block {
+  margin: 0 auto 0.5em auto;
+  padding: 15px 10px 15px 55px;
+  background: #cec URL('../images/ok.png') left center no-repeat;
+  border: 1px solid #9c9;
+  width: 450px;
+  font-size: 120%;
+  font-weight: bolder;
+}
+
+.notice {
+  margin: 0.5em auto 0.5em auto;
+  padding: 15px 10px 15px 55px;
+  width: 450px;
+  background: #eef URL('../images/info.png') left center no-repeat;
+  border: 1px solid #cce;
+}
+
+.fielderror {
+    color: red;
+    font-weight: bold;
+}
diff --git a/ipa-server/ipa-gui/ipagui/templates/grouplayout.kid b/ipa-server/ipa-gui/ipagui/templates/grouplayout.kid
index 53b6ce0a7..af05a8082 100644
--- a/ipa-server/ipa-gui/ipagui/templates/grouplayout.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/grouplayout.kid
@@ -1,22 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"

-    py:extends="'master.kid'">

-<head>

-</head>

-

-<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">

-      <div id="main_content">

-        <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>

-

-        <div py:replace="[item.text]+item[:]"></div>

-      </div>

-

-      <div id="sidebar">

-          <h2>Tools</h2>

-          <a href="${tg.url('/groupindex')}">Add Group</a><br/>

-          <a href="${tg.url('/groupindex')}">Find Group</a><br/>

-          <a href="${tg.url('/groupindex')}">List Groups</a><br/>

-      </div>

-</body>

-

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
+    py:extends="'master.kid'">
+<head>
+</head>
+
+<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
+      <div id="main_content">
+        <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>
+
+        <div py:replace="[item.text]+item[:]"></div>
+      </div>
+
+      <div id="sidebar">
+          <h2>Tools</h2>
+          <a href="${tg.url('/groupindex')}">Add Group</a><br/>
+          <a href="${tg.url('/groupindex')}">Find Group</a><br/>
+          <a href="${tg.url('/groupindex')}">List Groups</a><br/>
+      </div>
+</body>
+
+</html>
diff --git a/ipa-server/ipa-gui/ipagui/templates/master.kid b/ipa-server/ipa-gui/ipagui/templates/master.kid
index 436f0378f..464560d26 100644
--- a/ipa-server/ipa-gui/ipagui/templates/master.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/master.kid
@@ -1,48 +1,48 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<?python import sitetemplate ?>

-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="sitetemplate">

-

-<head py:match="item.tag=='{http://www.w3.org/1999/xhtml}head'" py:attrs="item.items()">

-    <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>

-    <title py:replace="''">Your title goes here</title>

-    <meta py:replace="item[:]"/>

-    <style type="text/css" media="screen">

-    @import "${tg.url('/static/css/style.css')}";

-    </style>

-</head>

-

-<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">

-    <div py:if="tg.config('identity.on') and not defined('logging_in')" id="pageLogin">

-        <span py:if="tg.identity.anonymous">

-            <a href="${tg.url('/login')}">Login</a>

-        </span>

-        <span py:if="not tg.identity.anonymous">

-            Welcome ${tg.identity.user.display_name}.

-            <a href="${tg.url('/logout')}">Logout</a>

-        </span>

-    </div>

-

-    <div id="page">

-      <div id="header">

-        <h1>Free IPA</h1>

-      </div>

-

-      <div id="nav">

-        <ul>

-          <li><a href="${tg.url('/userindex')}">Users</a></li>

-          <li><a href="${tg.url('/groupindex')}">Groups</a></li>

-          <li><a href="${tg.url('/resindex')}">Resources</a></li>

-        </ul>

-      </div>

-

-      <div py:replace="[item.text]+item[:]"></div>

-

-

-      <div id="footer">

-        This is the footer

-      </div>

-    </div>

-

-</body>

-

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?python import sitetemplate ?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="sitetemplate">
+
+<head py:match="item.tag=='{http://www.w3.org/1999/xhtml}head'" py:attrs="item.items()">
+    <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
+    <title py:replace="''">Your title goes here</title>
+    <meta py:replace="item[:]"/>
+    <style type="text/css" media="screen">
+    @import "${tg.url('/static/css/style.css')}";
+    </style>
+</head>
+
+<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
+    <div py:if="tg.config('identity.on') and not defined('logging_in')" id="pageLogin">
+        <span py:if="tg.identity.anonymous">
+            <a href="${tg.url('/login')}">Login</a>
+        </span>
+        <span py:if="not tg.identity.anonymous">
+            Welcome ${tg.identity.user.display_name}.
+            <a href="${tg.url('/logout')}">Logout</a>
+        </span>
+    </div>
+
+    <div id="page">
+      <div id="header">
+        <h1>Free IPA</h1>
+      </div>
+
+      <div id="nav">
+        <ul>
+          <li><a href="${tg.url('/userindex')}">Users</a></li>
+          <li><a href="${tg.url('/groupindex')}">Groups</a></li>
+          <li><a href="${tg.url('/resindex')}">Resources</a></li>
+        </ul>
+      </div>
+
+      <div py:replace="[item.text]+item[:]"></div>
+
+
+      <div id="footer">
+        This is the footer
+      </div>
+    </div>
+
+</body>
+
+</html>
diff --git a/ipa-server/ipa-gui/ipagui/templates/reslayout.kid b/ipa-server/ipa-gui/ipagui/templates/reslayout.kid
index 3f5aa96e3..5b9b35c12 100644
--- a/ipa-server/ipa-gui/ipagui/templates/reslayout.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/reslayout.kid
@@ -1,22 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"

-    py:extends="'master.kid'">

-<head>

-</head>

-

-<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">

-      <div id="main_content">

-        <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>

-

-        <div py:replace="[item.text]+item[:]"></div>

-      </div>

-

-      <div id="sidebar">

-          <h2>Tools</h2>

-          <a href="${tg.url('/resindex')}">Add Resource</a><br/>

-          <a href="${tg.url('/resindex')}">Find Resource</a><br/>

-          <a href="${tg.url('/resindex')}">List Resources</a><br/>

-      </div>

-</body>

-

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
+    py:extends="'master.kid'">
+<head>
+</head>
+
+<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
+      <div id="main_content">
+        <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>
+
+        <div py:replace="[item.text]+item[:]"></div>
+      </div>
+
+      <div id="sidebar">
+          <h2>Tools</h2>
+          <a href="${tg.url('/resindex')}">Add Resource</a><br/>
+          <a href="${tg.url('/resindex')}">Find Resource</a><br/>
+          <a href="${tg.url('/resindex')}">List Resources</a><br/>
+      </div>
+</body>
+
+</html>
diff --git a/ipa-server/ipa-gui/ipagui/templates/userlayout.kid b/ipa-server/ipa-gui/ipagui/templates/userlayout.kid
index de7164f33..40ddcca39 100644
--- a/ipa-server/ipa-gui/ipagui/templates/userlayout.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/userlayout.kid
@@ -1,22 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"

-    py:extends="'master.kid'">

-<head>

-</head>

-

-<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">

-      <div id="main_content">

-        <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>

-

-        <div py:replace="[item.text]+item[:]"></div>

-      </div>

-

-      <div id="sidebar">

-          <h2>Tools</h2>

-          <a href="${tg.url('/usernew')}">Add Person</a><br/>

-          <a href="${tg.url('/userindex')}">Find People</a><br/>

-          <a href="${tg.url('/userlist')}">List People</a><br/>

-      </div>

-</body>

-

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
+    py:extends="'master.kid'">
+<head>
+</head>
+
+<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
+      <div id="main_content">
+        <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>
+
+        <div py:replace="[item.text]+item[:]"></div>
+      </div>
+
+      <div id="sidebar">
+          <h2>Tools</h2>
+          <a href="${tg.url('/usernew')}">Add Person</a><br/>
+          <a href="${tg.url('/userindex')}">Find People</a><br/>
+          <a href="${tg.url('/userlist')}">List People</a><br/>
+      </div>
+</body>
+
+</html>
diff --git a/ipa-server/ipa-gui/ipagui/templates/welcome.kid b/ipa-server/ipa-gui/ipagui/templates/welcome.kid
index 02b140f64..dc08c0b32 100644
--- a/ipa-server/ipa-gui/ipagui/templates/welcome.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/welcome.kid
@@ -1,18 +1,18 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"

-    py:extends="'master.kid'">

-<head>

-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>

-<title>Welcome</title>

-</head>

-<body>

-    <div id="sidebar">

-        <h2>Tools</h2>

-    </div>

-    <div id="main_content">

-        <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>

-        <h1>Welcome to Free IPA</h1>

-    </div>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
+    py:extends="'master.kid'">
+<head>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
+<title>Welcome</title>
+</head>
+<body>
+    <div id="sidebar">
+        <h2>Tools</h2>
+    </div>
+    <div id="main_content">
+        <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>
+        <h1>Welcome to Free IPA</h1>
+    </div>
+
+</body>
+</html>