Merge branch 'master' of github.com:shish/shimmie2

This commit is contained in:
Shish 2012-02-11 00:55:39 +00:00
commit 4b0bcf44f8
3 changed files with 5 additions and 7 deletions

View file

@ -25,8 +25,8 @@ class TagEditTheme extends Themelet {
<tr> <tr>
<td width='50px'>Tags</td> <td width='50px'>Tags</td>
<td width='300px'> <td width='300px'>
<span class='view'>$h_tags</span> <!--<span class='view'>$h_tags</span>-->
<input class='edit' type='text' name='tag_edit__tags' value='$h_tags' class='autocomplete_tags' id='tag_editor'> <input type='text' name='tag_edit__tags' value='$h_tags' class='autocomplete_tags' id='tag_editor' onfocus='$(\".view\").hide(); $(\".edit\").show();'>
</td> </td>
</tr> </tr>
"; ";

View file

@ -86,11 +86,6 @@ class ViewImageTheme extends Themelet {
$html .= " $html .= "
</table> </table>
</form> </form>
<script>
$(function() {
$('.edit').hide();
});
</script>
"; ";
return $html; return $html;
} }

View file

@ -241,3 +241,6 @@ UL {
text-align: right; text-align: right;
padding-right: 4px; padding-right: 4px;
} }
.image_info .edit {
display: none;
}