[frio] Don't lose title in photo permission modals

diff --git a/view/theme/frio/templates/photo_edit.tpl b/view/theme/frio/templates/photo_edit.tpl
index 7978ebe0f8f0219286ea287103c26322b6efcb70..1d77ddcb75441d65d5a91a7136ad9f5a22060481 100644 (file)
--- a/view/theme/frio/templates/photo_edit.tpl
+++ b/view/theme/frio/templates/photo_edit.tpl
@@ -19,7 +19,7 @@
        {{include file="field_radio.tpl" field=$rotate_ccw}}
 
        <div id="photo-edit-perms">
-               <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+               <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#photo-edit-permission-acl" onclick="return false;">
                        <i id="jot-perms-icon" class="fa {{$lockstate}}"></i> {{$permissions}}
                </button>
        </div>
@@ -27,14 +27,14 @@
        <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
 
        {{* The modal for advanced-expire (photo permissions) *}}
-       <div id="aclModal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+       <div id="photo-edit-permission-acl" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
                <div class="modal-dialog">
                        <div class="modal-content">
-                               <div class="modal-header" class="modal-header">
+                               <div class="modal-header">
                                        <button id="modal-close" type="button" class="close" data-dismiss="modal" aria-hidden="true">
                                                &times;
                                        </button>
-                                       <h4 id="modal-title" class="modal-title">{{$permissions}}</h4>
+                                       <h4 class="modal-title">{{$permissions}}</h4>
                                </div>
                                <div id="photos-edit-permissions-wrapper" class="modal-body">
                                        {{$aclselect nofilter}}

diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl
index 9f9675bba59b9cb1564b66b745a04507a8f65187..d315a050c5bad98207f699ccd3bf3372137d3271 100644 (file)
--- a/view/theme/frio/templates/photos_upload.tpl
+++ b/view/theme/frio/templates/photos_upload.tpl
@@ -30,7 +30,7 @@
 
                {{if $alt_uploader}}
                        <div id="photos-upload-perms" class="pull-right">
-                               <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+                               <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#photo-upload-permission-acl" onclick="return false;">
                                        <i id="jot-perms-icon" class="fa {{$lockstate}}"></i> {{$permissions}}
                                </button>
                        </div>
@@ -49,7 +49,7 @@
 
                        <div class="photos-upload-wrapper">
                                <div id="photos-upload-perms" class="btn-group pull-right">
-                                       <button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+                                       <button class="btn btn-default" data-toggle="modal" data-target="#photo-upload-permission-acl" onclick="return false;">
                                                <i id="jot-perms-icon" class="fa {{$lockstate}}"></i>
                                        </button>
 
@@ -63,14 +63,14 @@
                <div class="photos-upload-end" class="clearfix"></div>
 
                {{* The modal for advanced-expire *}}
-               <div id="aclModal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+               <div id="photo-upload-permission-acl" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
                        <div class="modal-dialog">
                                <div class="modal-content">
                                        <div class="modal-header">
                                                <button id="modal-close" type="button" class="close" data-dismiss="modal" aria-hidden="true">
                                                        &times;
                                                </button>
-                                               <h4 id="modal-title" class="modal-title">{{$permissions}}</h4>
+                                               <h4 class="modal-title">{{$permissions}}</h4>
                                        </div>
                                        <div id="photos-upload-permissions-wrapper" class="modal-body">
                                                {{$aclselect nofilter}}

diff --git a/view/theme/frio/templates/settings/profile/field/edit.tpl b/view/theme/frio/templates/settings/profile/field/edit.tpl
index 34dd700b00bf698f0545e55d97ae3d9f13c92cf8..38e7a928d8934241f660602787a42a673e186c24 100644 (file)
--- a/view/theme/frio/templates/settings/profile/field/edit.tpl
+++ b/view/theme/frio/templates/settings/profile/field/edit.tpl
@@ -19,7 +19,7 @@
        </p>
 
        {{* We include the aclModal directly into the template since we cant use frio's default modal *}}
-       <div class="modal" id="profile-field-acl-{{$profile_field.id}}">
+       <div id="profile-field-acl-{{$profile_field.id}}" class="modal fade">
                <div class="modal-dialog">
                        <div class="modal-content">
                                <div class="modal-header">