diff options
| author | Sebastian Silva <sebastian@somosazucar.org> | 2013-10-02 09:59:11 (GMT) |
|---|---|---|
| committer | Sebastian Silva <sebastian@somosazucar.org> | 2013-10-02 09:59:11 (GMT) |
| commit | 3261bfd64f5c61394deb73e536d62f30e514fe9b (patch) | |
| tree | f33adb91acf9bd0c313f658443db975b863c41de | |
| parent | b6132c36a1baf5527cd7a67868450e915a57f225 (diff) | |
It's more simple
Revert "fix http://tareas.somosazucar.org/hxp/issue18"
This reverts commit 42e7c0b090c40bf287f4f338793872c835cc4eaa.
| -rw-r--r-- | sugar_network_webui/templates/_browser-grid.html | 12 | ||||
| -rw-r--r-- | sugar_network_webui/templates/context-view.html | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sugar_network_webui/templates/_browser-grid.html b/sugar_network_webui/templates/_browser-grid.html index 8679ee1..2f2a63b 100644 --- a/sugar_network_webui/templates/_browser-grid.html +++ b/sugar_network_webui/templates/_browser-grid.html @@ -20,8 +20,13 @@ <img class="box-button gallery-icon has_tooltip" src="/static/icons/button-blank.png" title="{{_('artifact gallery')}}" /> </a> - <div class="iconbox has_tooltip" title="{{_('launch') + ' ' + context['title']}}"> + {%- if 'activity' in context['type'] -%} + <div class="iconbox has_tooltip" title="{{_('launch') + ' ' + context['title']}}"> <a href="/launch/{{context['guid']}}"> + {%- else -%} + <div class="iconbox has_tooltip" title="{{_('see') + ' ' + context['title']}}"> + <a href="/article/{{context['guid']}}"> + {%- endif -%} <img class="grid-icon" src="/context/icon/{{context['guid']}}?cursor_offset={{context.offset}}" /> </a> </div> @@ -42,10 +47,7 @@ class="star-emblem has_tooltip" src="/static/icons/add-link-small.png"/> </span> - <span class="iconbox has_tooltip" title="{{_('see') + ' ' + context['title']}}"> - <a href="/article/{{context['guid']}}"> - {{context['title']}}</a> - </span> + {{context['title']}} </div> </div> {%- endfor %} diff --git a/sugar_network_webui/templates/context-view.html b/sugar_network_webui/templates/context-view.html index 1b01098..8a1ba7b 100644 --- a/sugar_network_webui/templates/context-view.html +++ b/sugar_network_webui/templates/context-view.html @@ -40,7 +40,11 @@ <img class="wiki-icon has_tooltip {{all}}" src="/static/icons/button-list.png" title="{{_('all resources')}}" /> </a> <div class="iconbox has_tooltip" title="{{_('launch')}}"> + {%- if 'activity' in context['type'] -%} <a href="/launch/{{context['guid']}}"> + {%- else -%} + <a href="/article/{{context['guid']}}"> + {%- endif -%} <img class="grid-icon" src="/context/icon/{{context['guid']}}" /> </a> </div> @@ -62,11 +66,7 @@ class="star-emblem has_tooltip" src="/static/icons/add-link-small.png"/> </span> - <span class="iconbox has_tooltip" title="{{_('see')}}"> - <a href="/article/{{context['guid']}}"> - {{context['title']}} - </a> - </span> + {{context['title']}} </div> </div> <div id="accordion"> |