natalie/srchub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Nathan Adams
2013-08-01 22:30:35 -05:00
parent 750079ebac 7ebce22300
commit c9565db7a3
26 changed files with 529 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
indefero/src/IDF/templates/idf/admin/approveprojects.html Normal file
View File

@@ -0,0 +1,60 @@
{extends "idf/gadmin/base.html"}
{block request} class="active"{/block}
{block body}
{if $createdtext}
{$createdtext}
<br/>
<br/>
{/if}
{if $errors}
{foreach $errors as $error}
{$error}
{/foreach}
{/if}
<table>
<tr>
<th>
Short Name
</th>
<th>
Description
</th>
<th>
Repotype
</th>
<th>
Submitter
</th>
<th>
Date
</th>
<th>
Approve
</th>
</tr>
{foreach $requests as $req}
<tr>
<td>
{$req.shortname}
</td>
<td>
{$req.desc}
</td>
<td>
{$req.repotype}
</td>
<td>
{$req.get_submitter.login}
</td>
<td>
{$req.creation_dtime}
</td>
<td>
<a href="{url 'IDF_Views_Admin::projectRequestCreate'}{$req.id}/">Approve</a>
</td>
</tr>
{/foreach}
</table>
{/block}

10
indefero/src/IDF/templates/idf/admin/request-email.txt Normal file
View File

@@ -0,0 +1,10 @@
Hello {$user},
You are receiving this email because you have requested a repository.
Your request for {$shortname|safe} was approved!
If you have any questions please feel free to email a member of the development team.
Yours faithfully,
The development team.

1
indefero/src/IDF/templates/idf/gadmin/base.html
View File

@@ -42,6 +42,7 @@
<a href="{url 'IDF_Views_Admin::forge'}"{block tabforge}{/block}>{trans 'Forge'}</a>
<a href="{url 'IDF_Views_Admin::projects'}"{block tabprojects}{/block}>{trans 'Projects'}</a>
<a href="{url 'IDF_Views_Admin::users'}"{block tabusers}{/block}>{trans 'People'}</a>
<a href="{url 'IDF_Views_Admin::projectRequestCreate'}"{block request}{/block}>Approve Repo</a>
{if $usherConfigured}
<a href="{url 'IDF_Views_Admin::usher'}"{block tabusher}{/block}>{trans 'Usher'}</a>
{/if}

4
indefero/src/IDF/templates/idf/main-menu.html
View File

@@ -3,7 +3,9 @@
{if !$user.isAnonymous()}
{aurl 'url', 'idf_dashboard'}
<li>{blocktrans}Welcome, <strong><a class="userw" href="{$url}">{$user}</a></strong>.{/blocktrans}
<a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a></li>{else}<li>
<a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a></li>
<li><a href="{url 'IDF_Views_User::requestproject'}">Request Project</a></li>
{else}
<a href="{url 'IDF_Views::login'}">{trans 'Sign in or create your account'}</a></li>
{/if}{if $customForgePageEnabled}
<li><a href="{url 'IDF_Views::index'}">{trans 'Home'}</a></li>

7
indefero/src/IDF/templates/idf/register/index.html
View File

@@ -19,13 +19,6 @@
</td>
</tr>
<tr>
<th><strong>{$form.f.regkey.labelTag}:</strong></th>
<td>{if $form.f.regkey.errors}{$form.f.regkey.fieldErrors}{/if}
{$form.f.regkey|unsafe}<br />
<span class="helptext">{$form.f.regkey.help_text}</span>
</td>
</tr>
<tr>
<th><strong>{$form.f.email.labelTag}:</strong></th>
<td>{if $form.f.email.errors}{$form.f.email.fieldErrors}{/if}
{$form.f.email|unsafe}<br />

5
indefero/src/IDF/templates/idf/source/git/file.html
View File

@@ -1,5 +1,5 @@
{extends "idf/source/base.html"}
{block extraheader}<link rel="stylesheet" type="text/css" href="{media '/idf/css/prettify.css'}" />{/block}
{block extraheader} {/block}
{block docclass}yui-t1{assign $inSourceTree=true}{/block}
{block body}
<h2 class="top"><a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $commit)}">{trans 'Root'}</a><span class="sep">/</span>{if $breadcrumb}{$breadcrumb|safe}{/if}</h2>
@@ -26,6 +26,5 @@
{/block}
{block javascript}
<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>
<script type="text/javascript">prettyPrint();</script>
{/block}

5
indefero/src/IDF/templates/idf/source/mercurial/file.html
View File

@@ -1,5 +1,5 @@
{extends "idf/source/base.html"}
{block extraheader}<link rel="stylesheet" type="text/css" href="{media '/idf/css/prettify.css'}" />{/block}
{block extraheader} {/block}
{block docclass}yui-t1{assign $inSourceTree=true}{/block}
{block body}
@@ -27,6 +27,5 @@
{/block}
{block javascript}
<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>
<script type="text/javascript">prettyPrint();</script>
{/block}

5
indefero/src/IDF/templates/idf/source/svn/file.html
View File

@@ -1,5 +1,5 @@
{extends "idf/source/base.html"}
{block extraheader}<link rel="stylesheet" type="text/css" href="{media '/idf/css/prettify.css'}" />{/block}
{block extraheader} {/block}
{block docclass}yui-t1{assign $inSourceTree=true}{/block}
{block body}
<h2 class="top"><a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $commit)}">{trans 'Root'}</a><span class="sep">/</span>{if $breadcrumb}{$breadcrumb|safe}{/if}</h2>
@@ -43,6 +43,5 @@
{/block}
{block javascript}
<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>
<script type="text/javascript">prettyPrint();</script>
{/block}

60
indefero/src/IDF/templates/idf/user/projectrequest.html Normal file
View File

@@ -0,0 +1,60 @@
{extends "idf/base-simple.html"}
{block body}
{if $form.errors}
<div class="px-message-error">
<p>{trans 'Oops, please check the errors on the form.'}</p>
{if $form.get_top_errors}
{$form.render_top_errors|unsafe}
{/if}
</div>
{/if}
{if $success}
<div>
<p>
Thank you - your request has been received and will be approved by an admin shortly.
</p>
</div>
{/if}
{if $error}
<div class="px-message-error">
{$error}
</div>
{/if}
<form method="post" action=".">
<table class="form" summary="">
<tr>
<th><strong>{$form.f.shortname.labelTag}:</strong></th>
<td>{if $form.f.shortname.errors}{$form.f.shortname.fieldErrors}{/if}
{$form.f.shortname|unsafe}<br />
<span class="helptext">{$form.f.shortname.help_text}</span>
</td>
</tr>
<tr>
<th><strong>{$form.f.repotype.labelTag}:</strong></th>
<td>{if $form.f.repotype.errors}{$form.f.repotype.fieldErrors}{/if}
{$form.f.repotype|unsafe}<br />
<span class="helptext">{$form.f.repotype.help_text}</span>
</td>
</tr>
<tr>
<th><strong>{$form.f.desc.labelTag}:</strong></th>
<td>{if $form.f.desc.errors}{$form.f.desc.fieldErrors}{/if}
{$form.f.desc|unsafe}<br />
<span class="helptext">{$form.f.desc.help_text}</span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td><input type="submit" value="Request Project" name="submit" /></td>
</tr>
</table>
</form>
{/block}
{block context}
{/block}

2
indefero/src/IDF/templates/idf/user/public.html
View File

@@ -56,6 +56,8 @@ Projects:
{/if}
{/foreach}
</table>
Issues user is working on:<br/><br/>
{$issues.render}
{/block}
{block context}
<div class="issue-submit-info">