diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 10:55:59 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 10:55:59 -0500 |
| commit | 725daf2a5d31175764dc5110d2fa3e6bc60917bc (patch) | |
| tree | 1260f003b2351627ef0fa8fe0c1cb6f8ef630bdf /view | |
| parent | bcadd873eea086255152708c4d1cede4d3dcc581 (diff) | |
| parent | a3dcf491f14d6c044e3bd10844f5c737b21feae2 (diff) | |
| download | volse-hubzilla-725daf2a5d31175764dc5110d2fa3e6bc60917bc.tar.gz volse-hubzilla-725daf2a5d31175764dc5110d2fa3e6bc60917bc.tar.bz2 volse-hubzilla-725daf2a5d31175764dc5110d2fa3e6bc60917bc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
template proc: allow isolation of var name between [ and ]
group: fix create new group form
templates: fix tags
template proc: remove unused function and commented out code
template proc: first optimization
* master:
Diffstat (limited to 'view')
| -rwxr-xr-x | view/search_item.tpl | 4 | ||||
| -rwxr-xr-x | view/theme/dispy/wall_item.tpl | 4 | ||||
| -rwxr-xr-x | view/theme/dispy/wallwall_item.tpl | 4 | ||||
| -rwxr-xr-x | view/theme/duepuntozero/wall_item.tpl | 4 | ||||
| -rwxr-xr-x | view/theme/duepuntozero/wallwall_item.tpl | 4 | ||||
| -rwxr-xr-x | view/theme/vier/search_item.tpl | 5 | ||||
| -rw-r--r-- | view/theme/vier/wall_item.tpl | 5 | ||||
| -rw-r--r-- | view/theme/vier/wallwall_item.tpl | 4 | ||||
| -rwxr-xr-x | view/wall_item.tpl | 4 | ||||
| -rwxr-xr-x | view/wallwall_item.tpl | 4 |
10 files changed, 22 insertions, 20 deletions
diff --git a/view/search_item.tpl b/view/search_item.tpl index a889062e0..80d6678fb 100755 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -31,8 +31,8 @@ <div class="wall-item-links"> </div> <div class="wall-item-tags"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 0dcd30f7b..09cf64397 100755 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -53,8 +53,8 @@ <div class="wall-item-title-end"></div> <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body <div class="body-tag"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index 31f046a76..c3638094c 100755 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -58,8 +58,8 @@ <div class="wall-item-title-end"></div> <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body <div class="body-tag"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl index d165d9801..51e36b6f4 100755 --- a/view/theme/duepuntozero/wall_item.tpl +++ b/view/theme/duepuntozero/wall_item.tpl @@ -31,8 +31,8 @@ <div class="wall-item-title-end"></div> <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body <div class="body-tag"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index 75cd5f65e..211906c93 100755 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -35,8 +35,8 @@ <div class="wall-item-title-end"></div> <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body <div class="body-tag"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl index f2a3a3c8b..fb87d7661 100755 --- a/view/theme/vier/search_item.tpl +++ b/view/theme/vier/search_item.tpl @@ -37,9 +37,10 @@ <div class="wall-item-links"> </div> <div class="wall-item-tags"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} + </div> </div> <div class="wall-item-bottom"> diff --git a/view/theme/vier/wall_item.tpl b/view/theme/vier/wall_item.tpl index 8b06989fa..aa972937d 100644 --- a/view/theme/vier/wall_item.tpl +++ b/view/theme/vier/wall_item.tpl @@ -38,9 +38,10 @@ <div class="wall-item-links"> </div> <div class="wall-item-tags"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} + </div> </div> <div class="wall-item-bottom"> diff --git a/view/theme/vier/wallwall_item.tpl b/view/theme/vier/wallwall_item.tpl index a8a46c34c..c557b33f1 100644 --- a/view/theme/vier/wallwall_item.tpl +++ b/view/theme/vier/wallwall_item.tpl @@ -45,8 +45,8 @@ <div class="wall-item-links"> </div> <div class="wall-item-tags"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> diff --git a/view/wall_item.tpl b/view/wall_item.tpl index ddae5b609..c99077510 100755 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -31,8 +31,8 @@ <div class="wall-item-links"> </div> <div class="wall-item-tags"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index 3fc704e35..be942f261 100755 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -35,8 +35,8 @@ <div class="wall-item-links"> </div> <div class="wall-item-tags"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> |