Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Webapp: move toolbar buttons closer to edited data

Browse Source
This commit is contained in:
Doug Blank 2013-12-02 21:51:01 -05:00
parent 048f6d7f33
commit 8c9310aebc
8 changed files with 192 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
data/templates/view_event_detail.html
View File

@ -73,6 +73,34 @@
</table>
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/event/%s" event.handle args %}
<input type="hidden" id="place_return" name="place_return" value=""/>
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/event/" args %}
<input type="hidden" id="place_return" name="place_return" value=""/>
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Event" "/event/add" args %}
{% make_button "?Edit Event" "/event/%s/edit" event.handle args %}
{% make_button "-Delete Event" "/event/%s/delete" event.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
<!-- Tabs -->
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@ -104,32 +132,6 @@
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/event/%s" event.handle args %}
<input type="hidden" id="place_return" name="place_return" value=""/>
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/event/" args %}
<input type="hidden" id="place_return" name="place_return" value=""/>
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Event" "/event/add" args %}
{% make_button "?Edit Event" "/event/%s/edit" event.handle args %}
{% make_button "-Delete Event" "/event/%s/delete" event.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
</form>
{% endblock %}

57
data/templates/view_family_detail.html
View File

@ -131,6 +131,35 @@
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/family/%s" family.handle args %}
<input type="hidden" id="father_return" name="father_return" value=""/>
<input type="hidden" id="mother_return" name="mother_return" value=""/>
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/family/" args %}
<input type="hidden" id="father_return" name="father_return" value=""/>
<input type="hidden" id="mother_return" name="mother_return" value=""/>
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Family" "/family/add" args %}
{% make_button "?Edit Family" "/family/%s/edit" family.handle args %}
{% make_button "-Delete Family" "/family/%s/delete" family.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
<!-- Tabs -->
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@ -171,34 +200,6 @@
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/family/%s" family.handle args %}
<input type="hidden" id="father_return" name="father_return" value=""/>
<input type="hidden" id="mother_return" name="mother_return" value=""/>
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/family/" args %}
<input type="hidden" id="father_return" name="father_return" value=""/>
<input type="hidden" id="mother_return" name="mother_return" value=""/>
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Family" "/family/add" args %}
{% make_button "?Edit Family" "/family/%s/edit" family.handle args %}
{% make_button "-Delete Family" "/family/%s/delete" family.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
</form>
{% endblock %}

49
data/templates/view_media_detail.html
View File

@ -53,6 +53,31 @@
</tr>
</table>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/media/%s" media.handle args %}
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/media/" args %}
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Media" "/media/add" args %}
{% make_button "?Edit Media" "/media/%s/edit" media.handle args %}
{% make_button "-Delete Media" "/media/%s/delete" media.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
<!-- Tabs -->
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@ -80,30 +105,6 @@
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/media/%s" media.handle args %}
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/media/" args %}
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Media" "/media/add" args %}
{% make_button "?Edit Media" "/media/%s/edit" media.handle args %}
{% make_button "-Delete Media" "/media/%s/delete" media.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
</form>
{% endblock %}

35
data/templates/view_note_detail.html
View File

@ -70,23 +70,6 @@
</tr>
</table>
<!-- Tabs -->
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li class="ui-corner-top ui-state-default"><a class="tab-references" href="#tab-references">Reference</a></li>
<li class="ui-corner-top ui-state-default"><a class="tab-history" href="#tab-history">History</a></li>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references" style="background-color: #f4f0ec;">
{% note_reference_table note user action %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-history" style="background-color: #f4f0ec;">
{% history_table note user action %}
</div>
</div>
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/note/%s" note.handle args %}
@ -111,6 +94,24 @@
{% endif %}
{% else %}
{% endif %}
<!-- Tabs -->
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li class="ui-corner-top ui-state-default"><a class="tab-references" href="#tab-references">Reference</a></li>
<li class="ui-corner-top ui-state-default"><a class="tab-history" href="#tab-history">History</a></li>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references" style="background-color: #f4f0ec;">
{% note_reference_table note user action %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-history" style="background-color: #f4f0ec;">
{% history_table note user action %}
</div>
</div>
</div>
</div>
</form>
{% endblock %}

62
data/templates/view_person_detail.html
View File

@ -81,6 +81,38 @@
</div>
</div>
{% if logform %}
<table>
{{logform.as_table}}
</table>
{% endif %}
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/person/%s" person.handle args %}
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/person/" args %}
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Person" "/person/add" args %}
{% make_button "?Edit Person" "/person/%s/edit" person.handle args %}
{% make_button "-Delete Person" "/person/%s/delete" person.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
<!-- Tabs -->
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@ -138,36 +170,6 @@
</div>
</div>
{% if logform %}
<table>
{{logform.as_table}}
</table>
{% endif %}
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/person/%s" person.handle args %}
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/person/" args %}
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Person" "/person/add" args %}
{% make_button "?Edit Person" "/person/%s/edit" person.handle args %}
{% make_button "-Delete Person" "/person/%s/delete" person.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
</form>
{% endblock %}

49
data/templates/view_repository_detail.html
View File

@ -44,6 +44,31 @@
</tr>
</table>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/repository/%s" repository.handle args %}
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/repository/" args %}
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px">
{% make_button "+Add Repository" "/repository/add" args %}
{% make_button "?Edit Repository" "/repository/%s/edit" repository.handle args %}
{% make_button "-Delete Repository" "/repository/%s/delete" repository.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
<!-- Tabs -->
<div class="ui-tab ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@ -71,30 +96,6 @@
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/repository/%s" repository.handle args %}
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/repository/" args %}
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px">
{% make_button "+Add Repository" "/repository/add" args %}
{% make_button "?Edit Repository" "/repository/%s/edit" repository.handle args %}
{% make_button "-Delete Repository" "/repository/%s/delete" repository.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
</form>
{% endblock %}

49
data/templates/view_source_detail.html
View File

@ -49,6 +49,31 @@
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/source/%s" source.handle args %}
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/source/" args %}
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Source" "/source/add" args %}
{% make_button "?Edit Source" "/source/%s/edit" source.handle args %}
{% make_button "-Delete Source" "/source/%s/delete" source.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
<!-- Tabs -->
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@ -80,29 +105,5 @@
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/source/%s" source.handle args %}
<input type="hidden" name="action" value="save"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Save"/>
{% else %}
{% ifequal action "add" %}
{% make_button "Cancel" "/source/" args %}
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="search" value="{{search}}"/>
<input type="hidden" name="page" value="{{page}}"/>
<input type="submit" value="Create"/>
{% else %}
<div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
{% make_button "+Add Source" "/source/add" args %}
{% make_button "?Edit Source" "/source/%s/edit" source.handle args %}
{% make_button "-Delete Source" "/source/%s/delete" source.handle args %}
</div>
{% endifequal %}
{% endif %}
{% else %}
{% endif %}
</form>
{% endblock %}

19
data/templates/view_tag_detail.html
View File

@ -42,15 +42,6 @@
</tr>
</table>
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a class="tab-references" href="#tab-references" style=":hover {color: black;}">Reference</a></li>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references" style="background-color: #f4f0ec;">
{% tag_reference_table tag user action %}
</div>
</div>
{% if user.is_superuser %}
{% if action == "edit" %}
{% make_button "Cancel" "/tag/%s" tag.handle args %}
@ -75,6 +66,16 @@
{% endif %}
{% else %}
{% endif %}
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a class="tab-references" href="#tab-references" style=":hover {color: black;}">Reference</a></li>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references" style="background-color: #f4f0ec;">
{% tag_reference_table tag user action %}
</div>
</div>
</form>
{% endblock %}