srchub-old Commit Details

Date:

2013-08-01 22:28:00 (11 years 4 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

60c6cf57da73

Parents:

b16f77b940b5

Message:

Adding the ability to add tabs to documentation and issue editing

Adding the ability to have syntax highlighted wiki (ie documentation)
ex:

<pre class="prettyprint">
int main()
{
cout << "test" << endl;
}
</pre>

Changes:

A	indefero/www/media/idf/js/allowtabs.js (full)
M	indefero/src/IDF/Views/User.php (2 diffs)
M	indefero/src/IDF/templates/idf/source/git/file.html (2 diffs)
M	indefero/src/IDF/templates/idf/source/mercurial/file.html (2 diffs)
M	indefero/src/IDF/templates/idf/source/svn/file.html (2 diffs)

File differences

-281
282 282
283 283
284
285
286
287
288
289
290
284 291
285 292
286 293
... ...
291 298
292 299
293 300
294 
301
295 302
296 303
297 304
+        $user = $users[0];␊
        $user_data = IDF_UserData::factory($user);␊
␊
        $otags = array();␊
        // Note that this approach does not scale, we will need to add␊
        // a table to cache the meaning of the tags for large forges.␊
        foreach (IDF_Views::getProjects($user) as $project) {␊
            $otags = array_merge($otags, $project->getTagIdsByStatus('open'));␊
        }␊
␊
        $false = Pluf_DB_BooleanToDb(false, $db);␊
        $sql_results = $db->select(␊
            'SELECT id FROM '.$db->pfx.'idf_projects '.␊

        foreach ($sql_results as $id) {␊
            $ids[] = $id['id'];␊
        }␊
        $f_sql = new Pluf_SQL('owner=%s AND project IN (' . implode(', ', $ids) . ' )', array($user->id));␊
        $f_sql = new Pluf_SQL('owner=%s AND status IN (' .implode(', ', $otags) . ') AND project IN (' . implode(', ', $ids) . ' )', array($user->id));␊
␊
        $pag = new Pluf_Paginator(new IDF_Issue());␊
        $pag->class = 'recent-issues';␊
 ...
         $user = $users[0];␊
         $user_data = IDF_UserData::factory($user);␊
 ␊
+        $otags = array();␊
+        // Note that this approach does not scale, we will need to add␊
+        // a table to cache the meaning of the tags for large forges.␊
+        foreach (IDF_Views::getProjects($user) as $project) {␊
+            $otags = array_merge($otags, $project->getTagIdsByStatus('open'));␊
+        }␊
+␊
         $false = Pluf_DB_BooleanToDb(false, $db);␊
         $sql_results = $db->select(␊
             'SELECT id FROM '.$db->pfx.'idf_projects '.␊
         foreach ($sql_results as $id) {␊
             $ids[] = $id['id'];␊
         }␊
-        $f_sql = new Pluf_SQL('owner=%s AND project IN (' . implode(', ', $ids) . ' )', array($user->id));␊
+        $f_sql = new Pluf_SQL('owner=%s AND status IN (' .implode(', ', $otags) . ') AND project IN (' . implode(', ', $ids) . ' )', array($user->id));␊
 ␊
         $pag = new Pluf_Paginator(new IDF_Issue());␊
         $pag->class = 'recent-issues';␊

-1
2 
2
3 3
4 4
5 5
... ...
26 26
27 27
28 28
29 
30 
29
31 30
+{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>␊

{/block}␊
␊
{block javascript}␊
<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>␊
<script type="text/javascript">prettyPrint();</script>␊
␊
{/block}␊
 ...
 {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>␊
 {/block}␊
 ␊
 {block javascript}␊
-<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>␊
-<script type="text/javascript">prettyPrint();</script>␊
+␊
 {/block}␊

-1
2 
2
3 3
4 4
5 5
... ...
27 27
28 28
29 29
30 
31 
30
32 31
+{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}␊

{/block}␊
␊
{block javascript}␊
<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>␊
<script type="text/javascript">prettyPrint();</script>␊
␊
{/block}␊
 ...
 {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}␊
 {/block}␊
 ␊
 {block javascript}␊
-<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>␊
-<script type="text/javascript">prettyPrint();</script>␊
+␊
 {/block}␊

-1
2 
2
3 3
4 4
5 5
... ...
43 43
44 44
45 45
46 
47 
46
48 47
+{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>␊

{/block}␊
␊
{block javascript}␊
<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>␊
<script type="text/javascript">prettyPrint();</script>␊
␊
{/block}␊
 ...
 {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>␊
 {/block}␊
 ␊
 {block javascript}␊
-<script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>␊
-<script type="text/javascript">prettyPrint();</script>␊
+␊
 {/block}␊

-
2
3
4
5
6
7
8
9
10
11
+$("textarea").keydown(function(e) {␍␊
  var $this, end, start;␍␊
  if (e.keyCode === 9) {␍␊
    start = this.selectionStart;␍␊
    end = this.selectionEnd;␍␊
    $this = $(this);␍␊
    $this.val($this.val().substring(0, start) + "\t" + $this.val().substring(end));␍␊
    this.selectionStart = this.selectionEnd = start + 1;␍␊
    return false;␍␊
  }␍␊
});
+$("textarea").keydown(function(e) {␍␊
+  var $this, end, start;␍␊
+  if (e.keyCode === 9) {␍␊
+    start = this.selectionStart;␍␊
+    end = this.selectionEnd;␍␊
+    $this = $(this);␍␊
+    $this.val($this.val().substring(0, start) + "\t" + $this.val().substring(end));␍␊
+    this.selectionStart = this.selectionEnd = start + 1;␍␊
+    return false;␍␊
+  }␍␊
+});

Download the corresponding diff file

srchub-old

File differences

Branches

Tags