clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7067 from MrPetovan/task/remove-app-error

Browse Source 
Remove App->error
This commit is contained in:
Philipp
2019-05-02 17:24:56 +02:00
committed by GitHub
parent 1b32270237 dd0b7d2642
commit 07cb887885
19 changed files with 269 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
view/templates/album_edit.tpl
-1
View File
@@ -9,7 +9,6 @@
<div id="photo-album-edit-name-end"></div>
<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
</form>
</div>
view/templates/photo_album.tpl
+6
View File
@@ -3,6 +3,12 @@
{{if $edit}}
<div id="album-edit-link"><a href="{{$edit.1}}" title="{{$edit.0}}">{{$edit.0}}</a></div>
{{/if}}
{{if $edit}}
<div id="album-edit-link"><a href="{{$edit.1}}" title="{{$edit.0}}">{{$edit.0}}</a></div>
{{/if}}
{{if $drop}}
<div id="album-drop-link"><a href="{{$drop.1}}" title="{{$drop.0}}">{{$drop.0}}</a></div>
{{/if}}
<div class="photos-upload-link" ><a href="{{$order.1}}" title="{{$order.0}}">{{$order.0}}</a></div>
{{if $can_post}}
<div class="photos-upload-link" ><a href="{{$upload.1}}">{{$upload.0}}</a></div>
view/templates/photo_edit.tpl
+1 -5
View File
@@ -1,6 +1,5 @@
<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
<form action="photos/{{$nickname}}/image/{{$resource_id}}/edit" method="post" id="photo_edit_form" >
<input type="hidden" name="item_id" value="{{$item_id}}" />
<input type="hidden" name="origaname" value="{{$album.2}}" />
@@ -28,9 +27,6 @@
<div id="photo-edit-perms-end"></div>
<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete();" />
<div id="photo-edit-end"></div>
</form>
view/templates/photo_view.tpl
+15 -4
View File
@@ -4,11 +4,22 @@
<div id="photo-edit-link-wrap">
{{if $tools}}
<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
|
<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
{{if $tools.view}}
<a id="photo-view-link" href="{{$tools.view.0}}">{{$tools.view.1}}</a>
{{/if}}
{{if $tools.edit}}
<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
{{/if}}
{{if $tools.delete}}
| <a id="photo-edit-link" href="{{$tools.delete.0}}">{{$tools.delete.1}}</a>
{{/if}}
{{if $tools.profile}}
| <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
{{/if}}
{{if $tools.lock}}
| <img src="images/lock_icon.gif" class="lockview" alt="{{$tools.lock}}" onclick="lockview(event,'photo/{{$id}}');" />
{{/if}}
{{/if}}
{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
</div>
{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1 nofilter}}</a></div>{{/if}}
view/theme/frio/js/mod_photos.js
+9
View File
@@ -23,6 +23,15 @@ $(document).ready(function() {
addToModal(modalUrl, 'photo-album-edit-wrapper');
}
});
// Click event listener for the album drop link/button.
$("body").on('click', '#album-drop-link', function() {
var modalUrl = $(this).attr("data-modal-url");
if (typeof modalUrl !== "undefined") {
addToModal(modalUrl);
}
});
});
$(window).load(function() {
view/theme/frio/templates/album_edit.tpl
-1
View File
@@ -7,7 +7,6 @@
<div class="pull-right">
<input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
<input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
</div>
</form>
<div class="clear"></div>
view/theme/frio/templates/confirm.tpl
+1 -3
View File
@@ -1,6 +1,5 @@
<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}">
<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}" class="generic-page-wrapper">
<div id="confirm-message">{{$message}}</div>
{{foreach $extra_inputs as $input}}
<input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
@@ -10,5 +9,4 @@
<button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm}}">{{$confirm}}</button>
<button type="submit" name="canceled" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel}}</button>
</div>
</form>
view/theme/frio/templates/photo_album.tpl
+6
View File
@@ -16,6 +16,12 @@
<i class="fa fa-pencil"></i>
</button>
{{/if}}
{{if $drop}}
<span class="icon-padding"> </span>
<button id="album-drop-link" class="btn-link page-action faded-icon" type="button" data-modal-url="{{$drop.1}}" title="{{$drop.0}}" data-toggle="tooltip">
<i class="fa fa-trash"></i>
</button>
{{/if}}
{{if ! $noorder}}
<span class="icon-padding"> </span>
view/theme/frio/templates/photo_view.tpl
+23 -5
View File
@@ -10,22 +10,38 @@
</a>
</div>
<div class="pull-right" id="photo-edit-link-wrap">
{{if $tools}}
{{if $tools}}
{{if $tools.view}}
<span class="icon-padding"> </span>
<a id="photo-edit-link" href="{{$tools.view.0}}" title="{{$tools.view.1}}" data-toggle="tooltip">
<i class="page-action faded-icon fa fa-image"></i>
</a>
{{/if}}
{{if $tools.edit}}
<span class="icon-padding"> </span>
<a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1}}" data-toggle="tooltip">
<i class="page-action faded-icon fa fa-pencil"></i>
</a>
{{/if}}
{{if $tools.delete}}
<span class="icon-padding"> </span>
<a id="photo-edit-link" href="{{$tools.delete.0}}" title="{{$tools.delete.1}}" data-toggle="tooltip">
<i class="page-action faded-icon fa fa-trash"></i>
</a>
{{/if}}
{{if $tools.profile}}
<span class="icon-padding"> </span>
<a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1}}" data-toggle="tooltip">
<i class="page-action faded-icon fa fa-user"></i>
</a>
{{/if}}
{{if $lock}}
{{/if}}
{{if $tools.lock}}
<span class="icon-padding"> </span>
<a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$lock}}" data-toggle="tooltip">
<a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$tools.lock}}" data-toggle="tooltip">
<i class="page-action faded-icon fa fa-lock"></i>
</a>
{{/if}}
{{/if}}
{{/if}}
</div>
<div class="clear"></div>
@@ -80,10 +96,12 @@
<hr>
</div>
{{if !$edit}}
{{* Insert the comments *}}
<div id="photo-comment-wrapper-{{$id}}" class="photo-comment-wrapper">
{{$comments nofilter}}
</div>
{{$paginate nofilter}}
{{/if}}
</div>
view/theme/quattro/templates/photo_view.tpl
+15 -4
View File
@@ -3,11 +3,22 @@
<div id="photo-edit-link-wrap">
{{if $tools}}
<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
|
<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
{{if $tools.view}}
<a id="photo-view-link" href="{{$tools.view.0}}">{{$tools.view.1}}</a>
{{/if}}
{{if $tools.edit}}
<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
{{/if}}
{{if $tools.delete}}
| <a id="photo-edit-link" href="{{$tools.delete.0}}">{{$tools.delete.1}}</a>
{{/if}}
{{if $tools.profile}}
| <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
{{/if}}
{{if $tools.lock}}
| <img src="images/lock_icon.gif" class="lockview" alt="{{$tools.lock}}" onclick="lockview(event,'photo/{{$id}}');" />
{{/if}}
{{/if}}
{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
</div>
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
view/theme/vier/templates/photo_view.tpl
+15 -4
View File
@@ -4,11 +4,22 @@
<div id="photo-edit-link-wrap">
{{if $tools}}
<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
|
<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
{{if $tools.view}}
<a id="photo-view-link" href="{{$tools.view.0}}">{{$tools.view.1}}</a>
{{/if}}
{{if $tools.edit}}
<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
{{/if}}
{{if $tools.delete}}
| <a id="photo-edit-link" href="{{$tools.delete.0}}">{{$tools.delete.1}}</a>
{{/if}}
{{if $tools.profile}}
| <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
{{/if}}
{{if $tools.lock}}
| <img src="images/lock_icon.gif" class="lockview" alt="{{$tools.lock}}" onclick="lockview(event,'photo/{{$id}}');" />
{{/if}}
{{/if}}
{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
</div>
{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1 nofilter}}</a></div>{{/if}}