Permalink
Browse files

moved \"insert\" link to the first column in the popup. removed 4th c…

…olumn everywhere. \"change\" link floats to the right of the main column now.
  • Loading branch information...
1 parent 15c429f commit 1343cfe3ce3c875cc995d21a5dc9d74b6ef0565d @stefanfoulis committed Jun 24, 2009
Showing with 5 additions and 6 deletions.
  1. +5 −6 image_filer/templates/image_filer/include/directory_table.html
@@ -4,13 +4,12 @@
<table cellspacing="0">
<thead>
<tr class="{% cycle 'row1' 'row2' as rowcolors %}">
- <th></th>
+ <th{% if is_popup %} style="width: 7em;"{% endif %}></th>
<!-- THUMB -->
<th class="thumbHeader">&nbsp;</th>
<!-- FILENAME / FOLDERNAME / DIMENSIONS / OWNER -->
<th>{% trans 'Name' %}</th>
- <th></th>
- <th></th>
+ <th style="width: 2.5em;"></th>
</tr>
</thead>
<tbody>
@@ -21,26 +20,26 @@
<td><a href="{% url image_filer-directory_listing subfolder.id %}{% if is_popup %}?_popup=1{% endif %}"><img src="/media/image_filer/icons/plainfolder_48x48.png" alt="Folder Icon" /></a></td>
<!-- Filename/Dimensions -->
<td>
+ {% if is_popup %}{% else %}<a style="display: block; float: right;" class="changelink" href="/admin/image_filer/folder/{{ subfolder.id }}">Change</a>{% endif %}
<div><b><a href="{% url image_filer-directory_listing subfolder.id %}{% if is_popup %}?_popup=1{% endif %}">{{ subfolder.name }}</a></b></div>
<div>owner: {{ subfolder.owner }} Folders: {{ subfolder.children_count }} Images: {{ subfolder.file_count }}</div>
</td>
- <td>{% if is_popup %}{% else %}<a class="changelink" href="/admin/image_filer/folder/{{ subfolder.id }}">Change</a>{% endif %}</td>
<td></td>
</tr>
{% endfor %}
{% for file in folder_files %}
<tr class="{% cycle rowcolors %}">
- <td></td>
+ <td>{% if is_popup %}<a class="insertlink insertlinkButton" href="" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id }}, '{{ file.file.extra_thumbnails.admin_tiny_icon|escapejs }}', '{{ file.label|escapejs }}'); return false;">{% trans "insert" %}</a>{% endif %}</td>
<!-- FileIcon -->
<td>{% if is_popup %}<a class="insertlink" href="" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id }}, '{{ file.file.extra_thumbnails.admin_tiny_icon|escapejs }}', '{{ file.label|escapejs }}'); return false;">{% else %}<a href="/admin/image_filer/image/{{ file.id }}/">{% endif %}<img src="{{ file.file.extra_thumbnails.admin_directory_listing_icon }}" alt="{{ file.default_alt_text }}" /></a></td>
<!-- Filename/Dimensions -->
<td>
+ {% if not is_popup %}<a style="display: block; float: right;" class="changelink" href="/admin/image_filer/image/{{ file.id }}">Change</a>{% endif %}
<div><b>{% if is_popup %}<a class="insertlink" href="" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id }}, '{{ file.file.extra_thumbnails.admin_tiny_icon|escapejs }}', '{{ file.label|escapejs }}'); return false;">{% else %}<a href="/admin/image_filer/image/{{ file.id }}/">{% endif %}{{ file.label }}</a></b></div>
<div><span class="tiny">{{ file.file.width }} x {{ file.file.height }} px ({{ file.file.size|filesize:"auto1000long" }})</span></div>
<div>owner: {{ file.owner }}</div>
{% if file.has_all_mandatory_data %}<div><img alt="0" src="/media/admin/img/admin/icon-yes.gif" /> has all mandatory metadata</div>{% else %}<div><img alt="1" src="/media/admin/img/admin/icon-no.gif"/> missing metadata!</div>{% endif %}
</td>
- <td>{% if is_popup %}<a class="insertlink insertlinkButton" href="" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id }}, '{{ file.file.extra_thumbnails.admin_tiny_icon|escapejs }}', '{{ file.label|escapejs }}'); return false;">{% trans "insert" %}</a>{% else %}<a class="changelink" href="/admin/image_filer/image/{{ file.id }}">Change</a>{% endif %}</td>
<td style="text-align: right;">
<form action="{% url image_filer-move_file_to_clipboard %}" method="post">
<input type="hidden" name="file_id" value="{{ file.id }}" />

0 comments on commit 1343cfe

Please sign in to comment.