fedora-updates-system/updatessystem/templates form.kid, 1.2, 1.3 login.kid, 1.2, 1.3 master.kid, 1.5, 1.6 push.kid, 1.2, 1.3 pushconsole.kid, 1.1, 1.2 show.kid, 1.4, 1.5
Luke Macken (lmacken)
fedora-extras-commits at redhat.com
Sat Jan 6 08:03:29 UTC 2007
Author: lmacken
Update of /cvs/fedora/fedora-updates-system/updatessystem/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8042/updatessystem/templates
Modified Files:
form.kid login.kid master.kid push.kid pushconsole.kid
show.kid
Log Message:
- lock down AdminController
- more identity integration
- create {pending,my} updates lists
- Allow push submissions
- Add F7 and EPEL5 releases
- Enable admin group
- Add beginning of PackageValidator and NewUpdateSchema
- Add AutoCompleteField to autocomplete package-version-release's in the new upd
ate form
- Other misc cleanups/fixes
Index: form.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/form.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- form.kid 31 Dec 2006 09:10:20 -0000 1.2
+++ form.kid 6 Jan 2007 08:03:27 -0000 1.3
@@ -35,7 +35,7 @@
}
}
- createLoggingPane(true);
+ //createLoggingPane(true);
logDebug("done");
</script>
</body>
Index: login.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/login.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- login.kid 1 Jan 2007 06:16:19 -0000 1.2
+++ login.kid 6 Jan 2007 08:03:27 -0000 1.3
@@ -11,8 +11,8 @@
</head>
<body>
- <h1>Login</h1>
- <p>${message}</p>
+ <h1 class="padded">Login</h1>
+ <p class="padded">${message}</p>
<form action="${previous_url}" method="POST">
<table class="login">
<tr>
Index: master.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/master.kid,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- master.kid 1 Jan 2007 06:16:19 -0000 1.5
+++ master.kid 6 Jan 2007 08:03:27 -0000 1.6
@@ -38,20 +38,28 @@
<!-- header END -->
<!-- leftside BEGIN -->
- <div id="fedora-side-left">
+ <div id="fedora-side-left" py:if="not tg.identity.anonymous">
<div id="fedora-side-nav-label">Site Navigation:</div>
+ <div py:if="'admin' in tg.identity.groups">
+ <ul id="fedora-side-nav">
+ <li><a href="/admin/push">Push updates</a></li>
+ <li><a href="/admin/catwalk">CatWalk</a></li>
+ </ul>
+ </div>
<ul id="fedora-side-nav">
<li><a href="/new">New update</a></li>
<li><a href="/list">List updates</a></li>
+ <li><a href="/pending">Pending updates</a></li>
<li><a href="/mine">My updates</a></li>
- <li><a href="/search">Search</a></li>
+ <!-- <li><a href="/search">Search</a></li> -->
<li><a href="/logout">Logout</a></li>
</ul>
</div>
<!-- leftside END -->
<!-- content BEGIN -->
- <div id="fedora-middle-two">
+
+ <div py:attrs="{'id' : tg.identity.anonymous and 'fedora-middle-three' or 'fedora-middle-two'}">
<div class="fedora-corner-tr"> </div>
<div class="fedora-corner-tl"> </div>
<div id="fedora-content">
Index: push.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/push.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- push.kid 31 Dec 2006 09:10:20 -0000 1.2
+++ push.kid 6 Jan 2007 08:03:27 -0000 1.3
@@ -10,7 +10,7 @@
<body>
-<form name="push_form" method="post" action="/push/console">
+<form name="push_form" method="post" action="/admin/push/console">
<table>
<tr py:for="update in updates">
<td>
@@ -19,7 +19,7 @@
</td>
</tr>
</table>
- <input type="submit" name="push" value="Push"/>
+ <input type="submit" name="push" value="Push" />
</form>
</body>
Index: pushconsole.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/pushconsole.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pushconsole.kid 31 Dec 2006 09:10:20 -0000 1.1
+++ pushconsole.kid 6 Jan 2007 08:03:27 -0000 1.2
@@ -16,46 +16,20 @@
<script lang="javascript">
function handler(evt){
- logDebug("onLoad handler");
+ //logDebug("onLoad handler");
var t = evt.target.responseText;
var console = getElement("push_console");
console.value += '\n' + t;
console.scrollTop = console.scrollHeight;
}
//createLoggingPane(true);
- logDebug("Creating new XMLHttpRequest");
+ //logDebug("Creating new XMLHttpRequest");
var req = new XMLHttpRequest();
req.multipart = true;
req.onload = handler;
- req.open("GET", "/push/push_updates", true);
+ req.open("GET", "/admin/push/push_updates", true);
req.send(null);
- logDebug("send req" + req);
+ //logDebug("send req" + req);
</script>
-
-
- <!--
- <div id="msg"></div>
- <script language="javascript">
- function showText(xmlhttp) {
- //alert(xmlhttp.responseText);
- logDebug("showText()");
- var console = getElement("push_console");
- console.value = console.value + '\n' + xmlhttp.responseText;
- }
- function showError(err) {
- alert("An error has occurred! The status was: " + err.number);
- }
-
- createLoggingPane(true);
-
- logDebug("Making doSimpleXMLHttpdRequest()");
- d = doSimpleXMLHttpRequest("/taint");
- d.addCallback(showText);
- d.addErrback(showError);
-
- </script>
- -->
-
-
</body>
</html>
Index: show.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/show.kid,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- show.kid 31 Dec 2006 09:10:20 -0000 1.4
+++ show.kid 6 Jan 2007 08:03:27 -0000 1.5
@@ -33,12 +33,18 @@
?>
<body>
-
- <div class="show">
- [ <a href="/edit/${update.nvr}">Edit</a> | <a href="/delete/${update.nvr}">Delete</a> ]
- </div>
+ <center>
+ <table width="97%">
+ <tr>
+ <td><div class="show">${update.nvr}</div></td>
+ <td align="right">
+ [ <a href="/submit/${update.nvr}">Push</a> | <a href="/edit/${update.nvr}">Edit</a> | <a href="/delete/${update.nvr}">Delete</a> ]
+ </td>
+ </tr>
+ </table>
+ </center>
<table class="show">
- <tr py:for="field in (['Package', update.nvr],
+ <tr py:for="field in (['Package', update.nvr],
['Update ID', update.update_id],
['Release', update.release.long_name],
['Testing', update.testing],
More information about the fedora-extras-commits
mailing list