cvsimport

[hcoop/zz_old/portal.git] / support.mlt

diff --git a/support.mlt b/support.mlt
index a9c64c9..ee5ea42 100644 (file)
--- a/support.mlt
+++ b/support.mlt
@@ -7,16 +7,16 @@ ref showNormal = true;
 
 if $"sub" <> "" then
        Support.subscribe { cat = Web.stoi ($"sub"), usr = you }
-       %><h3><b>Subscribed</b></h3>
+       %><h3>Subscribed</h3>
 
 <% elseif $"unsub" <> "" then
        Support.unsubscribe { cat = Web.stoi ($"unsub"), usr = you }
-       %><h3><b>Unsubscribed</b></h3>
+       %><h3>Unsubscribed</h3>
 
 <% elseif $"cmd" = "add" then
        Group.requireGroupName "support";
        val id = Support.addCategory (Web.stoi ($"grp"), $"name", $"descr")
-       %><h3><b>Category added</b></h3>
+       %><h3>Category added</h3>
 
 <% elseif $"mod" <> "" then
        Group.requireGroupName "support";
@@ -24,18 +24,18 @@ if $"sub" <> "" then
        val id = Web.stoi ($"mod");
        val cat = Support.lookupCategory id %>
 
-<h3><b>Modify category</b></h3>
+<h3>Modify category</h3>
 
 <form action="support" method="post">
 <input type="hidden" name="save" value="<% id %>">
-<table>
-<tr> <td align="right"><b>Name</b>:</td> <td><input name="name" value="<% Web.html (#name cat) %>"></td> </tr>
-<tr> <td align="right"><b>Owning group</b>:</td> <td><select name="grp">
+<table class="blanks">
+<tr> <td>Name:</td> <td><input name="name" value="<% Web.html (#name cat) %>"></td> </tr>
+<tr> <td>Owning group:</td> <td><select name="grp">
 <% foreach group in Group.listGroups () do %>
        <option value="<% #id group %>"<% if #id group = #grp cat then %> selected<% end %>><% #name group %></option>
 <% end %>
 </select></td> </tr>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr" value="<% Web.html (#descr cat) %>"></td> </tr>
+<tr> <td>Description:</td> <td><input name="descr" value="<% Web.html (#descr cat) %>"></td> </tr>
 <tr> <td><input type="submit" value="Save"></td> </tr>
 </table>
 </form>
@@ -45,14 +45,14 @@ if $"sub" <> "" then
        val id = Web.stoi ($"save");
        val cat = Support.lookupCategory id;
        Support.modCategory {cat with name = $"name", descr = $"descr", grp = Web.stoi ($"grp")}
-       %><h3><b>Category saved</b></h3>
+       %><h3>Category saved</h3>
 
 <% elseif $"del" <> "" then
        Group.requireGroupName "support";
        showNormal := false;
        val id = Web.stoi ($"del");
        val cat = Support.lookupCategory id;
-       %><h3><b>Are you sure you want to delete category "<% Web.html (#name cat) %>"?</b></h3>
+       %><h3>Are you sure you want to delete category "<% Web.html (#name cat) %>"?</h3>
        <a href="support?del2=<% id %>">Yes, delete "<% Web.html (#name cat) %>"!</a>
 
 <% elseif $"del2" <> "" then
@@ -60,13 +60,25 @@ if $"sub" <> "" then
        val id = Web.stoi ($"del2");
        val cat = Support.lookupCategory id;
        Support.deleteCategory id;
-       %><h3><b>"<% Web.html (#name cat) %>" deleted</b></h3>
+       %><h3>"<% Web.html (#name cat) %>" deleted</h3>
 
 <% end;
 
 if showNormal then %>
 
-<h3><b>Choose a category:</b></h3>
+<ul>
+<li> If you want to <b>request permission to configure a domain</b>, use <a href="domain">the separate form for that</a>.</li>
+<li> If you want to <b>request installation of a Debian package</b>, use <a href="apt">the separate form for that</a>.</li>
+<li> If you want to <b>request a Mailman mailing list</b>, use <a href="list">the separate form for that</a>.</li>
+<li> If you want to request <b>anything related to the ability to open network connections on particular ports or to particular hosts</b>, or you want permission to <b>have a crontab</b> or <b>use FTP</b>, see the <a href="sec">security settings</a> page.</li>
+<li> If you want to request <b>a MySQL or Postgres user account</b> or <b>a database</b>, then today is your lucky day! You don't need to ask anyone for permission to do that. Follow <a href="http://wiki.hcoop.net/wiki/UsingDatabases">the instructions on our wiki</a>.
+</ul>
+
+<h3>Otherwise...</h3>
+
+<p>Visit <a href="https://bugzilla.hcoop.net/enter_bug.cgi">our Bugzilla database</a> to open a custom issue.  You can log in there using the same username and password that you are using to access this portal.</p>
+
+<!--h3>Choose a category:</h3>
 
 <% foreach (sub, cat) in Support.listCategoriesWithSubscriptions you do %>
 <a href="issue?cat=<% #id cat %>"><% Web.html (#name cat) %></a>: <% Web.html (#descr cat) %>
@@ -80,22 +92,22 @@ if showNormal then %>
 <a href="support?del=<% #id cat %>">[Delete]</a>
 <% end %>
 <br>
-<% end %>
+<% end %>-->
 
 <% if admin then %>
 
-<h3><b>Add new category</b></h3>
+<h3>Add new category</h3>
 
 <form action="support" method="post">
 <input type="hidden" name="cmd" value="add">
-<table>
-<tr> <td align="right"><b>Name</b>:</td> <td><input name="name"></td> </tr>
-<tr> <td align="right"><b>Owning group</b>:</td> <td><select name="grp">
+<table class="blanks">
+<tr> <td>Name:</td> <td><input name="name"></td> </tr>
+<tr> <td>Owning group:</td> <td><select name="grp">
 <% foreach group in Group.listGroups () do %>
        <option value="<% #id group %>"><% #name group %></option>
 <% end %>
 </select></td> </tr>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr"></td> </tr>
+<tr> <td>Description:</td> <td><input name="descr"></td> </tr>
 <tr> <td><input type="submit" value="Add"></td> </tr>
 </table>
 </form>