]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons
authorrabuzarus <rabuzarus@t-online.de>
Sun, 2 Apr 2017 21:15:57 +0000 (23:15 +0200)
committerGitHub <noreply@github.com>
Sun, 2 Apr 2017 21:15:57 +0000 (23:15 +0200)
Frio: Turn action links into buttons

26 files changed:
view/global.css
view/theme/frio/css/mod_events.css
view/theme/frio/css/style.css
view/theme/frio/js/filebrowser.js
view/theme/frio/js/hovercard.js
view/theme/frio/js/theme.js
view/theme/frio/templates/comment_item.tpl
view/theme/frio/templates/common_tabs.tpl
view/theme/frio/templates/contact_edit.tpl
view/theme/frio/templates/contact_template.tpl
view/theme/frio/templates/contacts-template.tpl
view/theme/frio/templates/event.tpl
view/theme/frio/templates/event_form.tpl
view/theme/frio/templates/events_js.tpl
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/group_side.tpl
view/theme/frio/templates/jot.tpl
view/theme/frio/templates/nav.tpl
view/theme/frio/templates/profile_advanced.tpl
view/theme/frio/templates/profile_edit.tpl
view/theme/frio/templates/profile_vcard.tpl
view/theme/frio/templates/prv_message.tpl
view/theme/frio/templates/search_item.tpl
view/theme/frio/templates/settings.tpl
view/theme/frio/templates/threaded_conversation.tpl
view/theme/frio/templates/wall_thread.tpl

index 3fb31a30cc15e7b54e15af75a31785b5134480fd..b8fe5723f2c3d78535243ed49ffce33cc8535b17 100644 (file)
@@ -273,19 +273,19 @@ img.acpopup-img {
 
 /* plain text editor upload/select popup */
 
-.fbrowser .path a { padding: 5px; }
-.fbrowser .path a:before { content: "/"; padding-right: 5px;}
+.fbrowser .path a, .fbrowser .path .btn-link { padding: 5px; }
+.fbrowser .path a:before, .fbrowser .path .btn-link:before { content: "/"; padding-right: 5px;}
 .fbrowser .folders ul { list-style-type: none; padding-left: 10px;}
 .fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; }
 .fbrowser.image .photo-album-image-wrapper { float: left; }
-.fbrowser.image a img { height: 48px; }
-.fbrowser.image a p { display: none;}
+.fbrowser.image a img, .fbrowser.image .btn-link img { height: 48px; }
+.fbrowser.image a p, .fbrowser.image .btn-link p { display: none;}
 .fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; }
 .fbrowser.file img { display: inline; }
 .fbrowser.file p  { display: inline; white-space: nowrap; }
 .fbrowser .upload { clear: both; padding-top: 1em;}
 .fbrowser .error { background: #ffeeee; border: 1px solid #994444; color: #994444; padding: 0.5em;}
-.fbrowser .error a.close { float: right; font-weight: bold; }
+.fbrowser .error .close { float: right; font-weight: bold; }
 .fbrowser .error.hidden { display: none; }
 
 a {
index 5ca22300158eee6f47b20a8d6d800440d4885a6b..6512d1bbec8826c08594b1faa016bc644242807f 100644 (file)
@@ -25,7 +25,7 @@
 #event-calendar-title {
     vertical-align: middle;
 }
-a#event-calendar-views {
+#event-calendar-views {
     padding: 6px 9px;
     font-size: 14px
 }
index 946f71e21fdd7620b015172c16880777c071c3c0..245cd39fff4bd2690fdee2d3afd7eaced8044f9a 100644 (file)
@@ -51,10 +51,14 @@ body a[name]:not([href]) {
     visibility: hidden;
 }
 
-body a:hover, body a:focus, body a:active, body a.active, body .btn-link:hover{
+body a:hover, .btn-link:hover,
+body a:focus, .btn-link:focus,
+body a:active, .btn-link:active,
+body a.active, .btn-link.active {
     /*color: #59d6e4;*/
     color: $link_hover_color;
     text-decoration: none;
+    outline: none;
 }
 
 .wall-item-container a:hover {
@@ -186,6 +190,12 @@ a#item-delete-selected {
     outline: 0;
     background: $btn_primary_hover_color !important;
 }
+.btn-default:active, .btn-default.active {
+    color: $link_color;
+}
+.btn-default:active:hover, .btn-default.active:hover {
+    color: $link_hover_color;
+}
 .btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
 .btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
 .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
@@ -196,10 +206,13 @@ a#item-delete-selected {
 }
 
 .btn-link {
+    border: 0;
     color: $link_color;
+    padding-left: 0;
+    padding-right: 0;
 }
-.btn-link:focus, .btn-link:hover {
-    color: #23527c;
+.btn {
+       color: inherit;
 }
 .btn-eventnav, btn-eventnav:hover {
     font-size: 16px;
@@ -395,7 +408,8 @@ header #banner #logo-img,
     top: 2px;
     right: 10px
 }
-.topbar .dropdown-header .dropdown-header-link a {
+.topbar .dropdown-header .dropdown-header-link a,
+.topbar .dropdown-header .dropdown-header-link .btn-link {
     /*color: #6fdbe8!important;*/
     color: $link_color !important;
     font-size: 12px;
@@ -548,9 +562,8 @@ nav.navbar .nav>li>a:focus{
 #topbar-first .dropdown-footer {
     margin: 10px 10px 5px
 }
-#topbar-first a,
-nav.navbar a {
-    /*color: #fff*/
+#topbar-first a, #topbar-first .btn-link,
+nav.navbar a, nav.navbar .btn-link {
     color: $nav_icon_color;
 }
 #topbar-first .caret {
@@ -644,10 +657,12 @@ nav.navbar a {
 #myNavmenu li.nav-sitename {
     font-weight: bold;
 }
-#topbar-first .dropdown.account>a,
-#topbar-first .dropdown.account.open>a,
-#topbar-first .dropdown.account>a:hover,
-#topbar-first .dropdown.account.open>a:hover {
+#topbar-first .dropdown.account > a,
+#topbar-first .dropdown.account.open > a,
+#topbar-first .dropdown.account > button,
+#topbar-first .dropdown.account.open > button,
+#topbar-first .dropdown.account > :hover,
+#topbar-first .dropdown.account.open > :hover {
     background-color: $nav_bg;
 }
 #topbar-first .dropdown.account li#nav-sitename {
@@ -696,7 +711,7 @@ nav.navbar a {
 @media screen and (max-width: 767px) {
     #topbar-second > .container,
     #topbar-second #navbar-button {
-       padding: 0;
+    padding: 0;
     }
 }
 #topbar-second .dropdown-menu {
@@ -815,6 +830,25 @@ nav.navbar a {
 }
 
 /* Dropdown Menus */
+.nav > li > .btn-link {
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+}
+.nav > li > .btn-link:focus,
+.nav > li > .btn-link:hover {
+    text-decoration: none;
+    background-color: #eee;
+}
+.nav .open > .btn-link,
+.nav .open > .btn-link:focus,
+.nav .open > .btn-link:hover {
+    background-color: #eee;
+    border-color: #337ab7;
+}
+.nav-pills > li > .btn-link {
+    border-radius: 4px;
+}
 .nav-pills .dropdown-menu,
 .nav-tabs .dropdown-menu,
 .account .dropdown-menu,
@@ -836,41 +870,43 @@ nav.navbar a {
 .contact-photo-wrapper .dropdown-menu li {
     border-left: 3px solid $nav_bg;
 }
-.nav-pills .dropdown-menu li a,
-.nav-tabs .dropdown-menu li a,
-.account .dropdown-menu li a,
-.contact-photo-wrapper .dropdown-menu li a {
+.nav-pills .dropdown-menu li a, .nav-pills .dropdown-menu li .btn-link,
+.nav-tabs .dropdown-menu li a, .nav-tabs .dropdown-menu li .btn-link,
+.account .dropdown-menu li a, .account .dropdown-menu li .btn-link,
+.contact-photo-wrapper .dropdown-menu li a, .contact-photo-wrapper .dropdown-menu li .btn-link {
     color: $nav_icon_color;
     font-weight: 400;
     font-size: 13px;
     padding: 4px 15px;
     text-transform: capitalize;
+    width: 100%;
+    text-align: left;
 }
-.nav-pills .dropdown-menu li a i,
-.nav-tabs .dropdown-menu li a i,
-.account .dropdown-menu li a i,
-.contact-photo-wrapper .dropdown-menu li a i {
+.nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li .btn-link i,
+.nav-tabs .dropdown-menu li a i, .nav-tabs .dropdown-menu li .btn-link i,
+.account .dropdown-menu li a i, .account .dropdown-menu li .btn-link i,
+.contact-photo-wrapper .dropdown-menu li a i, .contact-photo-wrapper .dropdown-menu li .btn-link i {
     margin-right: 5px;
     font-size: 14px;
     display: inline-block;
     width: 14px
 }
-.nav-pills .dropdown-menu li a:hover,
-.nav-tabs .dropdown-menu li a:hover,
-.account .dropdown-menu li a:hover,
-.contact-photo-wrapper .dropdown-menu li a:hover,
-.nav-pills .dropdown-menu li a:visited,
-.nav-tabs .dropdown-menu li a:visited,
-.account .dropdown-menu li a:visited,
-.contact-photo-wrapper .dropdown-menu li a:visited,
-.nav-pills .dropdown-menu li a:hover,
-.nav-tabs .dropdown-menu li a:hover,
-.account .dropdown-menu li a:hover,
-.contact-photo-wrapper .dropdown-menu li a:hover,
-.nav-pills .dropdown-menu li a:focus,
-.nav-tabs .dropdown-menu li a:focus,
-.account .dropdown-menu li a:focus,
-.contact-photo-wrapper .dropdown-menu li a:focus {
+.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
+.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
+.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
+.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
+.nav-pills .dropdown-menu li a:visited, .nav-pills .dropdown-menu li .btn-link:visited,
+.nav-tabs .dropdown-menu li a:visited, .nav-tabs .dropdown-menu li .btn-link:visited,
+.account .dropdown-menu li a:visited, .account .dropdown-menu li .btn-link:visited,
+.contact-photo-wrapper .dropdown-menu li a:visited, .contact-photo-wrapper .dropdown-menu li .btn-link:visited,
+.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
+.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
+.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
+.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
+.nav-pills .dropdown-menu li a:focus, .nav-pills .dropdown-menu li .btn-link:focus,
+.nav-tabs .dropdown-menu li a:focus, .nav-tabs .dropdown-menu li .btn-link:focus,
+.account .dropdown-menu li a:focus, .account .dropdown-menu li .btn-link:focus,
+.contact-photo-wrapper .dropdown-menu li a:focus, .contact-photo-wrapper .dropdown-menu li .btn-link:focus {
     background: 0 0
 }
 .nav-pills .dropdown-menu li:hover,
@@ -1171,8 +1207,8 @@ section #jotOpen {
 .jothidden {
     /*display: none;*/
 }
-#jot-modal .modal-header a,
-#profile-jot-submit-wrapper a {
+#jot-modal .modal-header a, #jot-modal .modal-header .btn-link,
+#profile-jot-submit-wrapper a, #profile-jot-submit-wrapper .btn-link {
     color: #555;
     text-transform: capitalize;
 }
@@ -1315,8 +1351,6 @@ section #jotOpen {
 .wall-item-container a,
 .wall-item-container .fakelink,
 .toplevel_item .fakelink,
-.toplevel_item .wall-item-container .btn-link,
-.wall-item-container .btn-link,
 .toplevel_item .wall-item-container .wall-item-responses a {
     color: #555;
     -webkit-transition: all 0.25s ease-in-out;
@@ -1327,7 +1361,6 @@ section #jotOpen {
 }
 
 .toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink,
-.toplevel_item:hover .wall-item-container:hover .btn-link,
 .toplevel_item:hover .wall-item-container:hover .wall-item-responses a,
 .toplevel_item:hover .wall-item-content a,
 .toplevel_item:hover .wall-item-name,
@@ -1497,8 +1530,8 @@ section #jotOpen {
 @media screen and (max-width: 767px) {
     .shared-wrapper,
     .vevent {
-       margin-left: 0px;
-       margin-right: 0px;
+    margin-left: 0px;
+    margin-right: 0px;
     }
 }
 .shared-wrapper:hover,
@@ -1543,19 +1576,18 @@ code > .hl-main {
 }
 
 /* item social action buttons */
-.wall-item-actions, .wall-item-actions a {
+.wall-item-actions {
+    margin-top: 15px;
+}
+.wall-item-actions, .wall-item-actions a, .wall-item-actions button {
     font-size: 13px;
     color: #555;
-    margin-top: 15px;
     margin-bottom: 0;
 }
-.wall-item-actions a.active {
+.wall-item-actions .active {
     font-weight: bold;
 }
-.wall-item-actions a:hover {
-    color: #555;
-}
-.wall-item-actions a.active:hover {
+.wall-item-actions .active:hover {
     color: $link_color;
 }
 .wall-item-actions-left {
@@ -1576,10 +1608,11 @@ code > .hl-main {
 .wall-item-actions .button-comments,
 .wall-item-actions .button-votes,
 .wall-item-actions .button-likes {
-    padding-left: 0px;
-    padding-right: 0px;
     text-transform: capitalize;
 }
+.wall-item-actions .separator {
+       margin: 0 .3em;
+}
 
 /* wall item hover effects */
 .wall-item-container .wall-item-links,
@@ -1662,8 +1695,8 @@ code > .hl-main {
     padding-top: 5px !important;
     padding-bottom: 5px !important;
 }
-.comment-icon-list a.icon,
-.comment-icon-list a.icon:hover {
+.comment-icon-list > li > .icon,
+.comment-icon-list > li > .icon:hover {
     color: #555;
     background-color: transparent;
 }
@@ -1793,12 +1826,14 @@ ul.dropdown-menu li:hover {
 
 
 /* Dropdown Menu */
-.dropdown-menu li a {
+.dropdown-menu li a,
+.dropdown-menu li .btn-link {
     font-size: 13px!important;
     font-weight: 600!important;
 }
-.dropdown-menu li a:hover, .dropdown-menu li a:visited,
-.dropdown-menu li a:hover, .dropdown-menu li a:focus {
+.dropdown-menu li > :hover,
+.dropdown-menu li > :visited,
+.dropdown-menu li > :focus {
     background: 0 0;
 }
 
@@ -2010,22 +2045,22 @@ ul.viewcontact_wrapper > li {
 .contact-wrapper .contact-actions {
     display: flex;
 }
-.contact-wrapper a.contact-action-link {
+.contact-wrapper .contact-action-link,
+.contact-wrapper .contact-action-link:hover,
+.textcomplete-item .contact-wrapper .contact-action-link {
+    padding: 0 5px;
+    color: #555;
+    border: 0;
+}
+.contact-wrapper .contact-action-link {
     opacity: 0.1;
     transition: all 0.25s ease-in-out;
 }
-.contact-wrapper a.contact-action-link,
-.contact-wrapper a.contact-action-link:hover,
-.textcomplete-item .contact-wrapper a.contact-action-link {
-    padding-right: 5px;
-    padding-left: 5px;
-    color: #555;
-}
-ul li:hover .contact-wrapper a.contact-action-link {
+ul li:hover .contact-wrapper .contact-action-link {
     opacity: 0.8;
     transition: all 0.25s ease-in-out;
 }
-ul li:hover .contact-wrapper a.contact-action-link:hover {
+ul li:hover .contact-wrapper .contact-action-link:hover {
     opacity: 1;
 }
 #contacts-search-wrapper,
index a66309865dc10e6a243bc2af97f33424e748bf3f..d216c40f33ba94558cde5d3e4ed14ce408d0a2a3 100644 (file)
@@ -91,13 +91,13 @@ var FileBrowser = {
                // We need to add the AjaxUpload to the button\r
                FileBrowser.uploadButtons();\r
 \r
-               $(".error a.close").on("click", function(e) {\r
+               $(".error .close").on("click", function(e) {\r
                        e.preventDefault();\r
                        $(".error").addClass("hidden");\r
                });\r
 \r
                // Click on album link\r
-               $(".fbrowser").on("click", ".folders a, .path a", function(e) {\r
+               $(".fbrowser").on("click", ".folders a, .path a, .folders button, .path button", function(e) {\r
                        e.preventDefault();\r
                        var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";\r
                        $(".fbrowser-content").hide();\r
@@ -112,7 +112,6 @@ var FileBrowser = {
                                        FileBrowser.uploadButtons();\r
                                }\r
                        });\r
-                       \r
                });\r
 \r
                //embed on click\r
index d9f9429164bc903da2dc62564a7fa8760dcd9fbb..c3396b7626aecc4eb2923d76d067008132066f48 100644 (file)
@@ -1,11 +1,11 @@
-/* 
+/*
  * The javascript for friendicas hovercard. Bootstraps popover is needed.
- * 
- * Much parts of the code are from Hannes Mannerheims <h@nnesmannerhe.im> 
+ *
+ * Much parts of the code are from Hannes Mannerheims <h@nnesmannerhe.im>
  * qvitter code (https://github.com/hannesmannerheim/qvitter)
- * 
+ *
  * It is licensed under the GNU Affero General Public License <http://www.gnu.org/licenses/>
- * 
+ *
  */
 $(document).ready(function(){
        // Elements with the class "userinfo" will get a hover-card.
@@ -164,7 +164,7 @@ function getContactData(purl, url, actionOnSuccess) {
                        // The nurl will be the identifier in the object
                        if(data.nurl.length > 0) {
                                // Test if the contact is allready connected with the user (if url containing
-                               // the expression ("redir/") We will store different cache keys 
+                               // the expression ("redir/") We will store different cache keys
                                if((data.url.search("redir/")) >= 0 ) {
                                        var key = data.url;
                                } else {
@@ -212,7 +212,7 @@ function getHoverCardContent(purl, url, callback) {
        });
 
 // This is interisting. this pice of code ajax request are done asynchron.
-// To make it work getHOverCardTemplate() and getHOverCardData have to return it's 
+// To make it work getHOverCardTemplate() and getHOverCardData have to return it's
 // data (no succes handler for each of this). I leave it here, because it could be useful.
 // https://lostechies.com/joshuaflanagan/2011/10/20/coordinating-multiple-ajax-requests-with-jquery-when/
 //     $.when(
@@ -283,49 +283,3 @@ function getHoverCardVariables(object) {
 
        return variables;
 }
-
-// This is the html template for the hover-card
-// Since we grab the original hovercard.tpl we don't
-// need it anymore
-function hovercard_template() {
-       var tempate = '\
-       <div class="basic-content" >\
-               <div class="hover-card-details">\
-                       <div class="hover-card-header left-align">\
-                               <div class="hover-card-pic left-align">\
-                                       <span class="image-wrapper medium">\
-                                               <a href="{{$profile.url}}" title="{{$profile.name}}"><img href="" class="left-align thumbnail" src="{{$profile.thumb}}"></a>\
-                                       </span>\
-                               </div>\
-                               <div class="hover-card-content">\
-                                       <div class="profile-entry-name">\
-                                               <h4 class="left-align1"><a href="{{$profile.url}}">{{$profile.name}}</a></h4>{{if $profile.account_type}}<span>{{$profile.account_type}}</span>{{/if}}\
-                                       </div>\
-                                       <div class="profile-details">\
-                                               <span class="profile-addr">{{$profile.addr}}</span>\
-                                               {{if $profile.network}}<span class="profile-network"> ({{$profile.network}})</span>{{/if}}\
-                                       </div>\
-                                       {{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about}}</div>{{/if}}*}}\
-\
-                               </div>\
-                               <div class="hover-card-actions  right-aligned">\
-                                       {{* here are the differnt actions like privat message, poke, delete and so on *}}\
-                                       {{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}\
-                                       <div class="hover-card-actions-social">\
-                                               {{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal("{{$profile.actions.pm.1}}")" title="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}\
-                                               {{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal("{{$profile.actions.poke.1}}")" title="{{$profile.actions.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}\
-                                       </div>\
-                                       <div class="hover-card-actions-connection">\
-                                               {{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}\
-                                               {{if $profile.actions.drop}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.drop.1}}" title="{{$profile.actions.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}\
-                                               {{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" title="{{$profile.actions.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}\
-                                       </div>\
-                               </div>\
-                       </div>\
-\
-                       <div class="clearfix"></div>\
-\
-               </div>\
-       </div>\
-       {{if $profile.tags}}<div class="hover-card-footer">{{$profile.tags}}</div>{{/if}}';
-}
index 62cd85df9b53975e96ced89b868c78a489cae9ff..4e8ede07fd965289a63c996aa1fec2f0e50e4948 100644 (file)
@@ -617,3 +617,24 @@ function htmlToText(htmlString) {
 
        return text;
 }
+
+/**
+ * Sends a /like API call and updates the display of the relevant action button
+ * before the update reloads the item.
+ *
+ * @param {string} ident The id of the relevant item
+ * @param {string} verb The verb of the action
+ * @returns {undefined}
+ */
+function doLikeAction(ident, verb) {
+       unpause();
+
+       if (verb.indexOf('attend') === 0) {
+               $('.item-' + ident + ' .button-event:not(#' + verb + '-' + ident + ')').removeClass('active');
+       }
+       $('#' + verb + '-' + ident).toggleClass('active');
+       $('#like-rotator-' + ident.toString()).show();
+       $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+       liking = 1;
+       force_update = true;
+}
\ No newline at end of file
index a195c4dc04cd13444f877525ecb1f628428131cb..8ce7805bbd4785ac0b19b6b4d7163c44a1f74945 100644 (file)
 
                <div class="comment-edit-text-end clear"></div>
                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
-                       <button class="btn btn-primary btn-sm" type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
+                       <button type="submit" class="btn btn-primary btn-sm" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
                        {{if $preview}}
-                               <button class="btn btn-defaul btn-sm" type="button" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
+                               <button type="button" class="btn btn-defaul btn-sm" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
                        {{/if}}
                        <ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
                                <li>
-                                       <a class="icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
+                                       <button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
                                                <i class="fa fa-picture-o"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
+                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
                                                <i class="fa fa-link"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
+                                       <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
                                                <i class="fa fa-video-camera"></i>
-                                       </a>
+                                       </button>
                                </li>
 
                                <li>
-                                       <a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
+                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
                                                <i class="fa fa-underline"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
+                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
                                                <i class="fa fa-italic"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
+                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
                                                <i class="fa fa-bold"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
+                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
                                                <i class="fa fa-quote-left"></i>
-                                       </a>
+                                       </button>
                                </li>
                        </ul>
-                       <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
                </div>
 
                <div class="comment-edit-end clear"></div>
        </form>
-
+       <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 </div>
index 7cfd63528adb589f26a2ec8fa95f929aed2eef31..b0be33b6c59ec253bf2084ca12bca7da4a48ce15 100644 (file)
                </li>
 
                {{* The extended dropdown menu - this would be shown if the tab menu points
-                       dosn't fit in the available space. This is done through flexMenu.js *}}
+                       doesn't fit in the available space. This is done through flexMenu.js *}}
                <li class="pull-right">
                        <ul class="tabs tabs-extended" role="menu">
                                <li role="menuitem" class="dropdown flex-target">
-                                       <a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
                                        <i class="fa fa-chevron-down"></i>
-                                       </a>
+                                       </button>
                                </li>
                         </ul>
                </li>
@@ -45,9 +45,9 @@
                <li class="pull-right">
                        <ul class="tabs tabs-extended">
                                <li class="dropdown">
-                                       <a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
                                                <i class="fa fa-chevron-down"></i>
-                                       </a>
+                                       </button>
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
                                                {{foreach $exttabs as $tab}}
                                                <li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
index 4836a47429e5b831752e44308b3e8b206239ac0d..1173830f723064044640d4964caad4ab594f30b2 100644 (file)
                                {{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
                                <ul id="contact-edit-actions" class="nav nav-pills preferences">
                                        <li class="dropdown pull-right">
-                                               <a class="btn btn-link btn-sm dropdown-toggle" type="button" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
+                                               <button type="button" class="btn btn-link btn-sm dropdown-toggle" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
                                                        <i class="fa fa-angle-down"></i>&nbsp;{{$contact_action_button}}
-                                               </a>
+                                               </button>
 
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu" >
-                                                       {{if $lblsuggest}}<li role="menuitem"><a  href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
-                                                       {{if $poll_enabled}}<li role="menuitem"><a  href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
+                                                       {{if $lblsuggest}}<li role="menuitem"><a href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
+                                                       {{if $poll_enabled}}<li role="menuitem"><a href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
+                                                       {{if $lblsuggest || $poll_enabled}}
                                                        <li class="divider"></li>
-                                                       <li role="menuitem"><a  href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
-                                                       <li role="menuitem"><a  href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
-                                                       <li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
-                                                       <li role="menuitem"><a  href="#" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1'); return false;">{{$contact_actions.delete.label}}</a></li>
+                                                       {{/if}}
+                                                       <li role="menuitem"><a href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
+                                                       <li role="menuitem"><a href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
+                                                       <li role="menuitem"><a href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>
+                                                       <li role="menuitem"><button type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>
                                                </ul>
                                        </li>
                                </ul>
index 264e5a4c615fdf7cad7a80c7acfee2f57eaac740..5ae4fd4f793e06707def5a4175425b246a6afd50 100644 (file)
@@ -5,7 +5,7 @@
                <div class="contact-photo-wrapper dropdown pull-left" >
                        <div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}" >
 
-                               <a class="dropdown-toggle" id="contact-photo-menu-{{$contact.id}}" type="button"  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
+                               <button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{{$contact.id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
                                        <div class="contact-photo-image-wrapper hidden-xs">
                                                <img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
 
@@ -24,7 +24,7 @@
                                                        <span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down"></i></span>
                                                </div>
                                        </div>
-                               </a>
+                               </button>
 
 
                                {{if $contact.photo_menu}}
@@ -33,7 +33,7 @@
                                        {{if $c.2}}
                                        <li role="menuitem"><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
                                        {{elseif $c.3}}
-                                       <li role="menuitem"><a onclick="addToModal('{{$c.1}}')">{{$c.0}}</a></li>
+                                       <li role="menuitem"><button type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
                                        {{else}}
                                        <li role="menuitem"><a href="{{$c.1}}">{{$c.0}}</a></li>
                                        {{/if}}
                <div class="media-body">
                        {{* The contact actions like private mail, delete contact, edit contact and so on *}}
                        <div class="contact-actions pull-right nav-pills preferences hidden-xs">
-                               {{if $contact.photo_menu.pm}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
-                               {{if $contact.photo_menu.poke}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
-                               {{if $contact.photo_menu.network}}<a class="contact-action-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-                               {{if $contact.photo_menu.edit}}<a class="contact-action-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
-                               {{if $contact.photo_menu.drop}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}
-                               {{if $contact.photo_menu.follow}}<a class="contact-action-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
-                               {{if $contact.photo_menu.hide}}<a class="contact-action-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}
+                               {{if $contact.photo_menu.pm     }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{{/if}}
+                               {{if $contact.photo_menu.poke   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{{/if}}
+                               {{if $contact.photo_menu.network}}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
+                               {{if $contact.photo_menu.edit   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+                               {{if $contact.photo_menu.drop   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></button>{{/if}}
+                               {{if $contact.photo_menu.follow }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
+                               {{if $contact.photo_menu.hide   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}
                        </div>
 
                        {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
@@ -85,8 +85,8 @@
 
 </div>
 
-               
-{{* the following part is a nearly a copy of the part above but it is modyfied for working with js.
+
+{{* the following part is a nearly a copy of the part above but it is modified for working with js.
 We use this part to filter the contacts with jquery.textcomplete *}}
 <div class="javascript-template" rel="contact-template" style="display: none">
        <div class="contact-wrapper media" id="contact-entry-wrapper-{$id}" >
@@ -95,7 +95,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        <div class="contact-photo-wrapper dropdown pull-left" >
                                <div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}" >
 
-                                       <a class="dropdown-toggle" id="contact-photo-menu-{$id}" type="button"  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
+                                       <button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
                                                <div class="contact-photo-image-wrapper hidden-xs">
                                                        <img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name}" />
 
@@ -114,7 +114,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                                                                <span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down"></i></span>
                                                        </div>
                                                </div>
-                                       </a>
+                                       </button>
 
 
                                        {if $photo_menu}
@@ -123,7 +123,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                                                {if $c.2}
                                                <li role="menuitem"><a target="redir" href="{$c.1}">{$c.0}</a></li>
                                                {elseif $c.3}
-                                               <li role="menuitem"><a onclick="addToModal('{$c.1}')">{$c.0}</a></li>
+                                               <li role="menuitem"><button type="button" class="btn-link" onclick="addToModal('{$c.1}')">{$c.0}</button></li>
                                                {else}
                                                <li role="menuitem"><a href="{$c.1}">{$c.0}</a></li>
                                                {/if}
@@ -138,12 +138,12 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        <div class="media-body">
                                {{* The contact actions like private mail, delete contact, edit contact and so on *}}
                                <div class="contact-actions pull-right nav-pills preferences hidden-xs">
-                                       {if $photo_menu.pm}<a class="contact-action-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{/if}
-                                       {if $photo_menu.poke}<a class="contact-action-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{/if}
-                                       {if $photo_menu.network}<a class="contact-action-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{/if}
-                                       {if $photo_menu.edit}<a class="contact-action-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
-                                       {if $photo_menu.drop}<a class="contact-action-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
-                                       {if $photo_menu.follow}<a class="contact-action-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
+                                       {if $photo_menu.pm}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{/if}
+                                       {if $photo_menu.poke}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{/if}
+                                       {if $photo_menu.network}<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{/if}
+                                       {if $photo_menu.edit}<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
+                                       {if $photo_menu.drop}<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
+                                       {if $photo_menu.follow}<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
                                </div>
 
                                {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
index d51298038ba4f8ad23defe7105ae77a394f1f21c..43330edc95a96b16aeb281c5cbebea308785759e 100644 (file)
                {{* We put the contact batch actions in a dropdown menu *}}
                <ul class="nav nav-pills preferences">
                        <li class="dropdown pull-right">
-                               <a class="btn btn-link btn-sm dropdown-toggle" type="button" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+                               <button type="button" class="btn btn-link btn-sm dropdown-toggle" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
                                        <i class="fa fa-angle-down"></i>&nbsp;{{$h_batch_actions}}
-                               </a>
+                               </button>
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="BatchActionDropdownMenuTools">
                                {{foreach $batch_actions as $n=>$l}}
                                        <li role="menuitem">
                                                {{* call the js batch_submit_handler. Have a look at the buttom of this file *}}
-                                               <a onclick="batch_submit_handler('{{$n}}', '{{$l}}')">{{$l}}</a>
+                                               <button type="button" class="btn-link" onclick="batch_submit_handler('{{$n}}', '{{$l}}')">{{$l}}</button>
                                        </li>
                                {{/foreach}}
                                </ul>
@@ -75,7 +75,7 @@
      return false;
     }
   });
+
   // add javascript confirm dialog to "drop" links. Plain html url have "?confirm=1" to show confirmation form, we need to remove it
   $(".drop").each(function() {
    $(this).attr('href', $(this).attr('href').replace("confirm=1","") );
@@ -87,7 +87,7 @@
      return false;
     }
    });
-   
+
   });
  });
 
index dc37f19269d9ab6d9ded805ea2f7b68caecff88d..e73d04eccf42d366f10a0028b1b37a00898e847c 100644 (file)
@@ -17,7 +17,7 @@
                        </div>
 
                        <div class="event-buttons pull-right">
-                               {{if $event.edit}}<a onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}" class="edit-event-link btn"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
                                {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
                                {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
                        </div>
index 42d0bb37545bba15ff979581dc141f5c303bc7f9..c34fadc8ad9aef8176b2bd976b559190027555e9 100644 (file)
@@ -7,10 +7,22 @@
        <ul id="event-nav" class="nav nav-tabs event-nav" role="menubar" data-tabs="tabs">
                {{* Mark the first list entry as active because it is the first which is active after opening
                        the modal. Changing of the activity status is done by js in event_head.tpl *}}
-               <li class="active" role="menuitem"><a id="event-edit-lnk" onclick="eventEditActive(); return false;">{{$basic}}</a></li>
-               <li role="menuitem"><a id="event-desc-lnk" onclick="eventDescActive(); return false;">{{$advanced}}</a></li>
-               {{if $acl}}<li role="menuitem" {{if !$sh_checked}} style="display: none"{{/if}}><a id="event-perms-lnk" onclick="eventAclActive();return false;">{{$permissions}}</a></li>{{/if}}
-               {{if $preview}}<li role="menuitem"><a id="event-preview-lnk" onclick="eventPreviewActive();return false;">{{$preview}}</a></li>{{/if}}
+               <li class="active" role="menuitem">
+                       <a id="event-edit-lnk" onclick="eventEditActive(); return false;">{{$basic}}</a>
+               </li>
+               <li role="menuitem">
+                       <a id="event-desc-lnk" onclick="eventDescActive(); return false;">{{$advanced}}</a>
+               </li>
+               {{if $acl}}
+               <li role="menuitem" {{if !$sh_checked}} style="display: none"{{/if}}>
+                       <a id="event-perms-lnk" onclick="eventAclActive(); return false;">{{$permissions}}</a>
+               </li>
+               {{/if}}
+               {{if $preview}}
+               <li role="menuitem">
+                       <a id="event-preview-lnk" onclick="eventPreviewActive(); return false;">{{$preview}}</a>
+               </li>
+               {{/if}}
                {{* commented out because it isn't implemented yet
                <li role="menuitem"><a id="event-preview-link" onclick="fbrowserActive(); return false;"> Browser </a></li>
                *}}
                                <ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                        {{* commented out because it isn't implemented yet
                                        <li>
-                                               <a class="icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
+                                               <button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
                                                        <i class="fa fa-picture-o"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        *}}
                                        <li>
-                                               <a class="icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
+                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
                                                        <i class="fa fa-link"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        <li>
-                                               <a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
+                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
                                                        <i class="fa fa-video-camera"></i>
-                                               </a>
+                                               </button>
                                        </li>
 
                                        <li>
-                                               <a class="icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
+                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
                                                        <i class="fa fa-underline"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        <li>
-                                               <a class="icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
+                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
                                                        <i class="fa fa-italic"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        <li>
-                                               <a class="icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
+                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
                                                        <i class="fa fa-bold"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        <li>
-                                               <a class="icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
+                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
                                                        <i class="fa fa-quote-left"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                </ul>
                                <div class="clear"></div>
                                <ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                        {{* commented out because it isn't implemented yet
                                        <li>
-                                               <a class="icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
+                                               <button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
                                                        <i class="fa fa-picture-o"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        *}}
                                        <li>
-                                               <a class="icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
+                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
                                                        <i class="fa fa-link"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        <li>
-                                               <a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
+                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
                                                        <i class="fa fa-video-camera"></i>
-                                               </a>
+                                               </button>
                                        </li>
 
                                        <li>
-                                               <a class="icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
+                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
                                                        <i class="fa fa-underline"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        <li>
-                                               <a class="icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
+                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
                                                        <i class="fa fa-italic"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        <li>
-                                               <a class="icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
+                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
                                                        <i class="fa fa-bold"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                        <li>
-                                               <a class="icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
+                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
                                                        <i class="fa fa-quote-left"></i>
-                                               </a>
+                                               </button>
                                        </li>
                                </ul>
                                <div class="clear"></div>
index dec47aed249792db1d97871a2ed367f6c07ec604..48a75639a22043b5d472f7bbda84bb57a3610730 100644 (file)
@@ -3,7 +3,7 @@
        {{include file="section_title.tpl" title=$title}}
 
        {{* The link to create a new event *}}
-       <div id="new-event-link"><a onclick="addToModal('{{$new_event.0}}')" >{{$new_event.1}}</a></div>
+       <div id="new-event-link"><button type="button" class="btn-link" onclick="addToModal('{{$new_event.0}}')" >{{$new_event.1}}</button></div>
 
        {{* We create our own fullcallendar header (with title & calendar view *}}
        <div id="fc-header">
                        {{* The dropdown to change the callendar view *}}
                        <ul class="nav nav-pills">
                                <li class="dropdown pull-right">
-                                       <a class="btn btn-link btn-sm dropdown-toggle" type="button" id="event-calendar-views" data-toggle="dropdown" aria-expanded="true">
+                                       <button type="button" class="btn btn-link btn-sm dropdown-toggle" type="button" id="event-calendar-views" data-toggle="dropdown" aria-expanded="true">
                                                <i class="fa fa-angle-down"></i> {{$view}}
-                                       </a>
+                                       </button>
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="event-calendar-views">
                                                <li role="menuitem">
-                                                       <a onclick="changeView('changeView', 'month');$('#events-calendar').fullCalendar('option', {contentHeight: '', aspectRatio: 1});">{{$month}}</a>
+                                                       <button type="button" class="btn-link" onclick="changeView('changeView', 'month');$('#events-calendar').fullCalendar('option', {contentHeight: '', aspectRatio: 1});">{{$month}}</button>
                                                </li>
                                                <li role="menuitem">
-                                                       <a onclick="changeView('changeView', 'agendaWeek');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$week}}</a>
+                                                       <button type="button" class="btn-link" onclick="changeView('changeView', 'agendaWeek');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$week}}</button>
                                                </li>
                                                <li role="menuitem">
-                                                       <a onclick="changeView('changeView', 'agendaDay');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$day}}</a>
+                                                       <button type="button" class="btn-link" onclick="changeView('changeView', 'agendaDay');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$day}}</button>
                                                </li>
                                                <li role="menuitem">
-                                                       <a onclick="changeView('changeView', 'listMonth');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$list}}</a>
+                                                       <button type="button" class="btn-link" onclick="changeView('changeView', 'listMonth');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$list}}</button>
                                                </li>
                                        </ul>
                                </li>
index 1a1bd9a6759aedb6a016937f6d08b18981cdac5c..20227f87965edda0ce0c1c44bd493b1f5292f8f2 100644 (file)
                <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
                <input id="fb-type" type="hidden" name="type" value="{{$type}}" />
 
-               <div class="error hidden">
-                       <span></span> <a href="#" class='close'>X</a>
-               </div>
+        <div class="error hidden">
+            <span></span> <button type="button" class="btn btn-link" class="close">X</a>
+        </div>
 
-               <div class="path">
-                       {{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-               </div>
+        <div class="path">
+            {{foreach $path as $p}}<button type="button" class="btn-link" data-folder="{{$p.0}}">{{$p.1}}</button>{{/foreach}}
+        </div>
 
-               {{if $folders }}
-               <div class="folders">
-                       <ul>
-                               {{foreach $folders as $f}}<li><a href="#" data-folder="{{$f.0}}">{{$f.1}}</a></li>{{/foreach}}
-                       </ul>
-               </div>
-               {{/if}}
+        {{if $folders }}
+        <div class="folders">
+            <ul>
+                {{foreach $folders as $f}}<li><button type="button" class="btn-link" data-folder="{{$f.0}}">{{$f.1}}</button></li>{{/foreach}}
+            </ul>
+        </div>
+        {{/if}}
 
-               <div class="list">
-                       {{foreach $files as $f}}
-                       <div class="photo-album-image-wrapper">
-                               <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
-                                       <img src="{{$f.2}}">
-                                       <p>{{$f.1}}</p>
-                               </a>
+        <div class="list">
+            {{foreach $files as $f}}
+            <div class="photo-album-image-wrapper">
+                <button type="button" class="btn btn-link photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+                    <img src="{{$f.2}}">
+                    <p>{{$f.1}}</p>
+                </button>
                        </div>
                        {{/foreach}}
                </div>
index e892c9bed0c6fd298b96488eed1f7387eab668f5..2f8c6a148030969cd1986abfc771d3313ca5a673 100644 (file)
@@ -34,7 +34,7 @@
        {{if $newgroup}}
        <div id="sidebar-new-group">
                {{* show the input field by clicking "new group" *}}
-               <a onclick="javascript:$('#group-new-form').fadeIn('fast');return false;">{{$createtext}}</a>
+               <button type="button" class="btn-link" onclick="javascript:$('#group-new-form').fadeIn('fast');">{{$createtext}}</button>
                <form id="group-new-form" action="group/new" method="post" style="display:none;">
                        <div class="form-group">
                                <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
index 90d17f6c4707a2a32c01a6ae6e9d182c018f585b..71fdae7cd3433063db3045bee528a14a3d735d28 100644 (file)
@@ -1,6 +1,6 @@
 
 {{* The button to open the jot - in This theme we move the button with js to the second nav bar *}}
-<button class="btn btn-sm btn-main pull-right" id="jotOpen" onclick="jotShow(); return false;"><i class="fa fa-pencil-square-o fa-2x"></i></button>
+<button class="btn btn-sm btn-main pull-right" id="jotOpen" onclick="jotShow();"><i class="fa fa-pencil-square-o fa-2x"></i></button>
 
 
 <div id="jot-content">
                        <ul class="nav nav-tabs hidden-xs jot-nav" role="menubar" data-tabs="tabs">
                                {{* Mark the first list entry as active because it is the first which is active after opening
                                        the modal. Changing of the activity status is done by js in jot.tpl-header *}}
-                               <li class="active" role="menuitem"><a id="jot-text-lnk" class="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a></li>
-                               {{if $acl}}<li role="menuitem"><a id="jot-perms-lnk" class="jot-perms-lnk" onclick="aclActive();return false;">{{$shortpermset}}</a></li>{{/if}}
-                               {{if $preview}}<li role="menuitem"><a id="jot-preview-lnk" class="jot-preview-lnk" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
-                               <li role="menuitem"><a id="jot-browser-link" onclick="fbrowserActive(); return false;">{{$browser}}</a></li>
+                               <li class="active" role="menuitem">
+                                       <a class="jot-text-lnk" id="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a>
+                               </li>
+                               {{if $acl}}
+                               <li role="menuitem">
+                                       <a class="jot-perms-lnk" id="jot-perms-lnk" onclick="aclActive(); return false;">{{$shortpermset}}</a>
+                               </li>
+                               {{/if}}
+                               {{if $preview}}
+                               <li role="menuitem">
+                                       <a class="jot-preview-lnk" id="jot-preview-lnk" onclick="previewActive(); return false;">{{$preview}}</a>
+                               </li>
+                               {{/if}}
+                               <li role="menuitem">
+                                       <a class="jot-browser-lnk" id="jot-browser-link" onclick="fbrowserActive(); return false;">{{$browser}}</a>
+                               </li>
                        </ul>
 
                        <div class="dropdown dropdown-head dropdown-mobile-jot jot-nav hidden-lg hidden-md hidden-sm" role="menubar" data-tabs="tabs" style="float: left;">
                                <ul class="dropdown-menu nav nav-pills">
                                        {{* mark the first list entry as active because it is the first which is active after opening
                                        the modal. Changing of the activity status is done by js in jot.tpl-header *}}
-                                       <li role="menuitem" style="display: none;"><a id="jot-text-lnk-mobile" class="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a></li>
-                                       {{if $acl}}<li role="menuitem"><a id="jot-perms-lnk-mobile" class="jot-perms-lnk" onclick="aclActive();return false;">{{$shortpermset}}</a></li>{{/if}}
-                                       {{if $preview}}<li role="menuitem"><a id="jot-preview-lnk-mobile" class="jot-preview-lnk" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
+                                       <li role="menuitem" style="display: none;">
+                                               <a class="jot-text-lnk" id="jot-text-lnk-mobile" onclick="jotActive(); return false;">{{$message}}</a>
+                                       </li>
+                                       {{if $acl}}
+                                       <li role="menuitem">
+                                               <a class="jot-perms-lnk" id="jot-perms-lnk-mobile" onclick="aclActive(); return false;">{{$shortpermset}}</a>
+                                       </li>
+                                       {{/if}}
+                                       {{if $preview}}
+                                       <li role="menuitem">
+                                               <a class="jot-preview-lnk" id="jot-preview-lnk-mobile" onclick="previewActive(); return false;">{{$preview}}</a>
+                                       </li>
+                                       {{/if}}
                                </ul>
                        </div>
                        <button type="button" class="close hidden-lg hidden-md hidden-sm" data-dismiss="modal" style="float: right;">&times;</button>
                                                {{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
                                                <li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
                                                *}}
-                                               <li><a href="#" onclick="return false;" id="wall-file-upload"  title="{{$attach}}"><i class="fa fa-paperclip"></i></a></li>
-                                               <li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}"><i class="fa fa-link"></i></a></li>
-                                               <li><a id="profile-video" onclick="jotVideoURL();return false;" title="{{$video}}"><i class="fa fa-film"></i></a></li>
-                                               <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="{{$audio}}"><i class="fa fa-music"></i></a></li>
-                                               <li><a id="profile-location" onclick="jotGetLocation();return false;" title="{{$setloc}}"><i class="fa fa-map-marker"></i></a></li>
+                                               <li><button type="button" class="btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
+                                               <li><button type="button" class="btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
+                                               <li><button type="button" class="btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
+                                               <li><button type="button" class="btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
+                                               <li><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
                                                <!-- TODO: waiting for a better placement
-                                               <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
+                                               <li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
                                                -->
 
                                                <li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>
index fc66403019bd11aa488c1be991933e129f3ce89d..f4387149290c75b178a3019463133cebe68b376f 100644 (file)
@@ -20,7 +20,7 @@
        <div class="container">
                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding"><!-- div for navbar width-->
                        <!-- Brand and toggle get grouped for better mobile display -->
-                       <div class="topbar-nav" role=”navigation”>
+                       <div class="topbar-nav" role="navigation">
 
                                {{* Buttons for the mobile view *}}
                                <button role="menu" type="button" class="navbar-toggle collapsed pull-right" data-toggle="offcanvas" data-target="#myNavmenu">
@@ -70,7 +70,7 @@
                                        {{* The notifications dropdown *}}
                                        {{if $nav.notifications}}
                                                <li id="nav-notification" class="nav-segment hidden-xs" role="presentation">
-                                                       <a role="menuitem" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" data-toggle="tooltip" title="{{$nav.notifications.1}}" class="btn-link" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                       <a role="menuitem" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" data-toggle="tooltip" title="{{$nav.notifications.1}}" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                                <i class="fa fa-exclamation-circle fa-lg"></i>
                                                                <span class="sr-only">{{$nav.notifications.1}}</span>
                                                                <span id="notify-update" class="nav-notify-badge badge nav-notify dropdown" data-toggle="dropdown"></span>
@@ -84,7 +84,7 @@
                                                                        <div class="arrow"></div>
                                                                        {{$nav.notifications.1}}
                                                                        <div class="dropdown-header-link">
-                                                                               <a href="#" onclick="notifyMarkAll(); return false;" data-toggle="tooltip" title="{{$nav.notifications.mark.3}}" class="">{{$nav.notifications.mark.1}}</a>
+                                                                               <button type="button" class="btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" title="{{$nav.notifications.mark.3}}">{{$nav.notifications.mark.1}}</button>
                                                                        </div>
 
                                                                </li>
                                        {{* The user dropdown menu *}}
                                        {{if $nav.userinfo}}
                                        <li role="menu" id="nav-user-linkmenu" class="dropdown account nav-menu hidden-xs">
-                                               <a href="#" id="main-menu" class="dropdown-toggle nav-avatar " data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                                               <button id="main-menu" class="btn-link dropdown-toggle nav-avatar" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
                                                        <div class="user-title pull-left hidden-xs hidden-sm hidden-md">
                                                                <strong>{{$nav.userinfo.name}}</strong><br>
                                                                {{if $nav.remote}}<span class="trunctate">{{$nav.remote}}</span>{{/if}}
 
                                                        <img  id="avatar" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}">
                                                        <span class="caret"></span>
-
-                                               </a>
+                                               </button>
 
                                                {{* The list of available usermenu links *}}
                                                <ul id="nav-user-menu" class="dropdown-menu pull-right menu-popup" role="group" aria-labelledby="main-menu">
index 7c9a7bef1a64f8e05d41cbc79e30d619c0e68bee..694d5c75dfead44de9510d38383cf8cc915d87fa 100644 (file)
@@ -1,23 +1,3 @@
-
-<script language="javascript" type="text/javascript">
-       // the following functions show/hide the specific profile page content 
-       // in dependence of the selected nav
-       function profileStandardActive() {
-               $("#profile-content-advanced").hide();
-               $("#profile-content-standard").show();
-               $("#profile-tab-advanced-link").parent("li").removeClass("active");
-               $("#profile-tab-standard-link").parent("li").addClass("active");
-       }
-
-       function profileAdvancedActive() {
-               $("#profile-content-standard").hide();
-               $("#profile-content-advanced").show();
-               $("#profile-tab-standard-link").parent("li").removeClass("active");
-               $("#profile-tab-advanced-link").parent("li").addClass("active");
-       }
-
-</script>
-
 <div id="profile-page" class="generic-page-wrapper">
        <h3 class="">{{$title}}</h3>
 
        {{/if}}
 
        {{* Frio does split the profile information in "standard" and "advanced". This is the tab menu for swithching between this modes *}}
-       <ul id="profile-menu" class="nav nav-tabs" role="menubar" data-tabs="tabs">
-               <li class="active" role="menuitem"><a id="profile-tab-standard-link" onclick="profileStandardActive(); return false;">{{$basic}}</a></li>
-               <li role="menuitem"><a id="profile-tab-advanced-link" onclick="profileAdvancedActive(); return false;">{{$advanced}}</a></li>
+       <ul id="profile-menu" class="nav nav-tabs" role="tablist">
+               <li role="presentation" class="active">
+                       <a href="#profile-content-standard" aria-controls="profile-content-standard" role="tab" data-toggle="tab">{{$basic}}</a>
+               </li>
+               <li role="presentation">
+                       <a href="#profile-content-advanced" aria-controls="profile-content-advanced" role="tab" data-toggle="tab">{{$advanced}}</a>
+               </li>
        </ul>
 
-       <div id="profile-content-standard">
-               <div id="aprofile-fullname" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.fullname.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.fullname.1}}</div>
-               </div>
-
-               {{if $profile.gender}}
-               <div id="aprofile-gender" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.gender.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.gender.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.birthday}}
-               <div id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.birthday.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.birthday.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.age}}
-               <div id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.age.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.age.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.hometown}}
-               <div id="aprofile-hometown" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.hometown.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.hometown.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.marital}}
-               <div id="aprofile-marital" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted"><span class="heart">&hearts;</span>  {{$profile.marital.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.homepage}}
-               <div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.about}}
-               <div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.pub_keywords}}
-               <div id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.pub_keywords.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.pub_keywords.1}}</div>
-               </div>
-               {{/if}}
-       </div>
-
-       <div id="profile-content-advanced" style="display: none">
-                               {{if $profile.sexual}}
-               <div id="aprofile-sexual" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.sexual.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.sexual.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.politic}}
-               <div id="aprofile-politic" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.politic.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.politic.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.religion}}
-               <div id="aprofile-religion" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.religion.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.religion.1}}</div>
-               </div>
-               {{/if}}
-
-
-               {{if $profile.interest}}
-               <div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.likes}}
-               <div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.dislikes}}
-               <div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.contact}}
-               <div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1}}</div>
-               </div>
-               {{/if}}
-
-
-               {{if $profile.music}}
-               <div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1}}</div>
-               </div>
-               {{/if}}
-
-
-               {{if $profile.book}}
-               <div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1}}</div>
-               </div>
-               {{/if}}
-
-
-               {{if $profile.tv}}
-               <div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1}}</div>
-               </div>
-               {{/if}}
-
-
-               {{if $profile.film}}
-               <div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1}}</div>
-               </div>
-               {{/if}}
-
-
-               {{if $profile.romance}}
-               <div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1}}</div>
-               </div>
-               {{/if}}
-
-
-               {{if $profile.work}}
-               <div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-               <hr class="profile-separator">
-               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
-               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.education}}
-               <div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1}}</div>
-               </div>
-               {{/if}}
-
-               {{if $profile.forumlist}}
-               <div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1}}</div>
+       <div class="tab-content">
+               <div role="tabpanel" class="tab-pane active" id="profile-content-standard">
+                       <div id="aprofile-fullname" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.fullname.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.fullname.1}}</div>
+                       </div>
+
+                       {{if $profile.gender}}
+                       <div id="aprofile-gender" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.gender.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.gender.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.birthday}}
+                       <div id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.birthday.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.birthday.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.age}}
+                       <div id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.age.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.age.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.hometown}}
+                       <div id="aprofile-hometown" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.hometown.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.hometown.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.marital}}
+                       <div id="aprofile-marital" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted"><span class="heart">&hearts;</span>  {{$profile.marital.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.homepage}}
+                       <div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.about}}
+                       <div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.pub_keywords}}
+                       <div id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.pub_keywords.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.pub_keywords.1}}</div>
+                       </div>
+                       {{/if}}
+               </div>
+
+               <div role="tabpanel" class="tab-pane advanced" id="profile-content-advanced">
+                       {{if $profile.sexual}}
+                       <div id="aprofile-sexual" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.sexual.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.sexual.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.politic}}
+                       <div id="aprofile-politic" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.politic.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.politic.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.religion}}
+                       <div id="aprofile-religion" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.religion.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.religion.1}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.interest}}
+                       <div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.likes}}
+                       <div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.dislikes}}
+                       <div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.contact}}
+                       <div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.music}}
+                       <div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.book}}
+                       <div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.tv}}
+                       <div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.film}}
+                       <div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.romance}}
+                       <div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.work}}
+                       <div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                       <hr class="profile-separator">
+                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
+                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.education}}
+                       <div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.forumlist}}
+                       <div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1}}</div>
+                       </div>
+                       {{/if}}
                </div>
-               {{/if}}
        </div>
 </div>
index 74ee1a05d6ddc4205cafc39752ba9d869dab9dfe..0e20bf21357df17f22e0b62a375d765f203cac6a 100644 (file)
@@ -6,12 +6,12 @@
        <div id="profile-edit-links">
                <ul class="nav nav-pills preferences">
                        <li class="dropdown pull-right">
-                               <a class="btn btn-link btn-sm dropdown-toggle" type="button" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
-                                                       <i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
-                               </a>
+                               <button type="button" class="btn btn-link btn-sm dropdown-toggle" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
+                                       <i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
+                               </button>
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
                                        <li role="menuitem"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user"  aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
-                                       <li role="menuitem"><a id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user"  aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
+                                       <li role="menuitem"><button type="button" class="btn-link" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</button></li>
                                        {{if ! $is_default}}
                                        <li class="nav-item"><a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil"  aria-hidden="true"></i>&nbsp;{{$editvis}}</a>
                                        </li>
index 1fc3ccf207a9fd28ddbc35040116953a95023a45..831c47171d6503b509bd61d926ae8ab786037b0e 100644 (file)
@@ -17,7 +17,7 @@
                                {{/if}}
                        {{/if}}
                        </div>
-               
+
                </div>
 
        {{* The short information which will appended to the second navbar by scrollspy *}}
                                {{/if}}
                                {{if $wallmessage}}
                                <div id="wallmessage-link-botton">
-                                       <a id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
+                                       <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
                                                <span class=""><i class="fa fa-envelope"></i></span>
                                                <span class="">{{$wallmessage}}</span>
-                                       </a>
+                                       </button>
                                </div>
                                {{/if}}
-                       
+
                </div>
 
                <div class="clear"></div>
 
                {{if $location}}
                        <div class="location detail">
-                               <span class="location-label icon"><i class="fa fa-map-marker"></i></span> 
+                               <span class="location-label icon"><i class="fa fa-map-marker"></i></span>
                                <span class="adr">
                                        {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address}}</span>{{/if}}
                                        <span class="city-state-zip">
@@ -89,7 +89,7 @@
 
                {{if $profile.xmpp}}
                        <div class="xmpp">
-                               <span class="xmpp-label icon"><i class="fa fa-comments"></i></span> 
+                               <span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
                                <span class="xmpp-data">{{$profile.xmpp}}</span>
                        </div>
                {{/if}}
index 5d39996841474a315ac36ff910fc23f26ac26acc..4079bb39262549223070f268429ce2bd813a9f5a 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="prvmail-wrapper">
 <form id="prvmail-form" action="message" method="post" >
-       
+
        {{* Disable the header. We will see if we will need it
        <h3>{{$header}}</h3>
        *}}
 
        <ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                <li>
-                                       <a class="icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
+                                       <button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
                                                <i class="fa fa-picture-o"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
+                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
                                                <i class="fa fa-link"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
+                                       <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
                                                <i class="fa fa-video-camera"></i>
-                                       </a>
+                                       </button>
                                </li>
 
                                <li>
-                                       <a class="icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
+                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
                                                <i class="fa fa-underline"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
+                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
                                                <i class="fa fa-italic"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
+                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
                                                <i class="fa fa-bold"></i>
-                                       </a>
+                                       </button>
                                </li>
                                <li>
-                                       <a class="icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
+                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
                                                <i class="fa fa-quote-left"></i>
-                                       </a>
+                                       </button>
                                </li>
                        </ul>
-       
+
        <div id="prvmail-text-bb-end"></div>
 
        {{* The submit button *}}
index 0a6eca0c2700fc182b0db5a9f3a8fa7fc20f46bc..fea94fb508b07b313d4d7ccac390b2945487958b 100644 (file)
@@ -1,13 +1,12 @@
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">
        <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
-       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
-       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, {{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
 </div>
 <!-- ./TODO => Unknow block -->
 
 
-<div class="panel" id="item-{{$item.guid}}">
+<div class="panel item-{{$item.id}}" id="item-{{$item.guid}}">
        <div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}" >
                <div class="media">
                        {{* Put additional actions in a top-right dropdown menu *}}
 
                                {{if $item.plink || $item.star || $item.drop.dropping || $item.edpost}}
                                <li class="dropdown">
-                                       <a class="dropdown-toggle" data-toggle="dropdown"  href="#" id="dropdownMenuTools-{{$item.id}}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></a>
+                                       <button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></button>
 
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                                {{if $item.plink}}      {{*link to the original source of the item *}}
-                                               <li role="menuitem">
-                                                       <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
-                                               </li>
-                                               {{/if}}
+                                               <li role="menuitem">
+                                                       <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
+                                               </li>
+                                               {{/if}}
 
                                                {{if $item.edpost}} {{* edit the posting *}}
                                                <li role="menuitem">
-                                                       <a href="#" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
+                                                       <button type="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.tagger}} {{* tag the post *}}
                                                <li role="menuitem">
-                                                       <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</a>
+                                                       <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.filer}}
                                                <li role="menuitem">
-                                                       <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</a>
+                                                       <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.star}}
                                                <li role="menuitem">
-                                                       <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</a>
-                                                       <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</a>
+                                                       <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
+                                                       <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.drop.dropping}}
                                                <li role="separator" class="divider"></li>
                                                <li role="menuitem">
-                                                       <a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
+                                                       <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
                                                </li>
                                                {{/if}}
                                        </ul>
@@ -83,9 +82,9 @@
 
                        {{* contact info header*}}
                        <div role="heading " class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-                               <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name btn-link {{$item.sparkle}}">{{$item.name}}</span></a>
-                                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name{{$item.osparkle}} btn-link" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
-                                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
+                               <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+                                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+                                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock}}">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
 
                                        <div class="additional-info text-muted">
                                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
                                </div>
                                <div class="wall-item-tags">
                                        {{foreach $item.hashtags as $tag}}
-                                               <span class='tag label btn-info sm'>{{$tag}} <i class="fa fa-bolt"></i></span>
+                                               <span class="tag label btn-info sm">{{$tag}} <i class="fa fa-bolt"></i></span>
                                        {{/foreach}}
 
                                        {{foreach $item.mentions as $tag}}
-                                               <span class='mention label btn-warning sm'>{{$tag}} <i class="fa fa-user"></i></span>
+                                               <span class="mention label btn-warning sm">{{$tag}} <i class="fa fa-user"></i></span>
                                        {{/foreach}}
 
                                        {{foreach $item.folders as $cat}}
-                                               <span class='folder label btn-danger sm'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                                               <span class="folder label btn-danger sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                        {{/foreach}}
 
                                        {{foreach $item.categories as $cat}}
-                                               <span class='category label btn-success sm'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                                               <span class="category label btn-success sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                        {{/foreach}}
                                </div>
                                        {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
                                <div class="wall-item-actions-left pull-left">
                                        <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
                                        <div id="button-reply" class="pull-left">
-                                               <span class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
+                                               <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
                                        </div>
                                        {{/if}}{{/if}}-->
 
                                        {{* Buttons for like and dislike *}}
                                        {{if $item.vote}}
                                                {{if $item.vote.like}}
-                                               <a role="button" href="#" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;">{{$item.vote.like.0}}</a>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
                                                {{/if}}
-
                                                {{if $item.vote.like AND $item.vote.dislike}}
-                                               <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                       <span role="presentation" class="separator">•</span>
                                                {{/if}}
 
                                                {{if $item.vote.dislike}}
-                                               <a role="button" href="#" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;">{{$item.vote.dislike.0}}</a>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
                                                {{/if}}
-
                                                {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
-                                               <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                       <span role="presentation" class="separator">•</span>
                                                {{/if}}
                                        {{/if}}
 
-                                       {{* Butten to open the comment text field *}}
+                                       {{* Button to open the comment text field *}}
                                        {{if $item.comment}}
-                                       <a role="button" class="" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}} </a>
+                                               <button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
                                        {{/if}}
 
                                        {{* Button for sharing the item *}}
                                        {{if $item.vote}}
-                                               {{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}}
-                                               <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
-                                               {{/if}}
                                                {{if $item.vote.share}}
-                                               <a role="button" href="#" class="" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</a>
+                                                       {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
+                                       <span role="presentation" class="separator">•</span>
+                                                       {{/if}}
+                                       <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
                                                {{/if}}
                                        {{/if}}
+                                       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                                </div>
 
 
                                        {{* Event attendance buttons *}}
                                        {{if $item.isevent}}
                                        <div class="vote-event">
-                                               <a role="button" href="#" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
-                                               <a role="button" href="#" class="button-event{{if $item.responses.attendno.self}} active{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
-                                               <a role="button" href="#" class="button-event{{if $item.responses.attendmaybe.self}} active{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}}, 'attendyes');"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}}, 'attendno');"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}}, 'attendmaybe');"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
                                        </div>
                                        {{/if}}
 
 
                                        {{* Display likes, dislike and attendance stats *}}
                        {{if $item.responses}}
-                               <div class="wall-item-responses">
-                                       {{foreach $item.responses as $verb=>$response}}
-                                       <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
-                                       {{/foreach}}
-                               </div>
+                       <div class="wall-item-responses">
+                               {{foreach $item.responses as $verb=>$response}}
+                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                               {{/foreach}}
+                       </div>
                        {{/if}}
 
                        <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
                        {{if $item.conv}}
-                                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+                               <a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title}}">{{$item.conv.title}}</a>
                        {{/if}}
                        </div>
                </div><!--./media>-->
index 6eed613ddd53eae038765bd2b8ab89f89b6200bc..bd81c986cd98fa5deb5cfb9a9402be549ca47f65 100644 (file)
                                                        {{include file="field_checkbox.tpl" field=$email_textonly}}
 
 
-                                                       {{* commented out because it was commented out in the original template 
+                                                       {{* commented out because it was commented out in the original template
                                                        <div class="field">
-                                                        <button onclick="javascript:Notification.requestPermission(function(perm){if(perm === 'granted')alert('{{$desktop_notifications_success_message}}');});return false;">{{$desktop_notifications}}</button>
+                                                        <button type="button" onclick="javascript:Notification.requestPermission(function(perm){if(perm === 'granted')alert('{{$desktop_notifications_success_message}}');});">{{$desktop_notifications}}</button>
                                                         <span class="field_help">{{$desktop_notifications_note}}</span>
                                                        </div>
                                                        *}}
index a5402ede5d9b426687693b5c15bf2def19c731b6..fc0e2558d7f579b3815159028ecb3332daf888e5 100644 (file)
@@ -19,8 +19,8 @@
 <div id="conversation-end"></div>
 
 {{if $dropping}}
-<a id="item-delete-selected" class="" href="#" title="{{$dropping}}" onclick="deleteCheckedItems();return false;" data-toggle="tooltip">
+<button type="button" id="item-delete-selected" class="btn btn-link" title="{{$dropping}}" onclick="deleteCheckedItems();" data-toggle="tooltip">
        <i class="fa fa-trash" aria-hidden="true"></i>
-</a>
+</button>
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 {{/if}}
index 85091cf1c69aa3858130e66c2802ae636c41b2fd..f2429a78b73f4abd90795fad9f39059f4599b470 100644 (file)
@@ -40,11 +40,11 @@ as the value of $top_child_total (this is done at the end of this file)
 
        {{if $item.thread_level<3}}
                <div class="hide-comments-outer-wrapper">
-                       <div class="hide-comments-outer btn-link" onclick="showHideComments({{$item.id}});">
+                       <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
                                <span id="hide-comments-total-{{$item.id}}"
                                        class="hide-comments-total">{{$item.num_comments}}</span>
                                <span id="hide-comments-{{$item.id}}"
-                                       class="hide-comments fakelink">{{$item.hide_text}}</span>
+                                       class="hide-comments">{{$item.hide_text}}</span>
                        </div>
                        <hr />
                </div>
@@ -68,9 +68,9 @@ as the value of $top_child_total (this is done at the end of this file)
 
 {{* Use a different div container in dependence max thread-level = 7 *}}
 {{if $item.thread_level<7}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
+<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
 {{else}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
+<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
  {{/if}}
        <div class="media">
                {{* Put addional actions in a top-right dropdown menu *}}
@@ -80,7 +80,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
                        {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer}}
                        <li class="dropdown">
-                               <a class="dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></a>
+                               <button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></button>
 
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                        {{if $item.plink}}      {{*link to the original source of the item *}}
@@ -91,26 +91,26 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                        {{if $item.edpost}} {{* edit the posting *}}
                                        <li role="menuitem">
-                                               <a onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
+                                               <button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.tagger}} {{* tag the post *}}
                                        <li role="menuitem">
-                                               <a id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</a>
+                                               <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.filer}}
                                        <li role="menuitem">
-                                               <a id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</a>
+                                               <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.star}}
                                        <li role="menuitem">
-                                               <a id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</a>
-                                               <a id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</a>
+                                               <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
+                                               <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
                                        </li>
                                        {{/if}}
 
@@ -120,16 +120,16 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                        {{if $item.ignore}}
                                                <li role="menuitem">
-                                                       <a id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="{{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</a>
+                                                       <button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</button>
                                                </li>
                                                <li role="menuitem">
-                                                       <a id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</a>
+                                                       <button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</button>
                                                </li>
                                        {{/if}}
 
                                        {{if $item.drop.dropping}}
                                        <li role="menuitem">
-                                               <a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
+                                               <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
                                        </li>
                                        {{/if}}
                                </ul>
@@ -184,15 +184,14 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* contact info header*}}
                {{if $item.thread_level==1}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-                       <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name btn-link {{$item.sparkle}}">{{$item.name}}</span></a>
-                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name{{$item.osparkle}} btn-link" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+                       <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
                        {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
                        </h4>
 
                        <div class="additional-info text-muted">
                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
                                        <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
-                                       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                                </div>
 
                                {{if $item.location}}
@@ -220,7 +219,7 @@ as the value of $top_child_total (this is done at the end of this file)
                <div class="media-body">{{*this is the media body for comments - this div must be closed at the end of the file *}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-comment">
                        <h5 class="media-heading">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="btn-link">{{$item.name}}</span></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>
                                <span class="text-muted">
                                        <small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
                                </span>
@@ -278,7 +277,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="wall-item-actions-left pull-left">
                                <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
                                <div id="button-reply" class="pull-left">
-                                       <span class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
+                                       <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
                                </div>
                                {{/if}}{{/if}}-->
 
@@ -287,45 +286,44 @@ as the value of $top_child_total (this is done at the end of this file)
                                {{* Buttons for like and dislike *}}
                                {{if $item.vote}}
                                        {{if $item.vote.like}}
-                                       <a role="button" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</a>
+                                       <button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
                                        {{/if}}
-
                                        {{if $item.vote.like AND $item.vote.dislike}}
-                                       <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                       <span role="presentation" class="separator"></span>
                                        {{/if}}
-
                                        {{if $item.vote.dislike}}
-                                       <a role="button" class="button-likes{{if $item.responses.dislike.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</a>
+                                       <button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
                                        {{/if}}
 
                                        {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
-                                       <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                       <span role="presentation" class="separator"></span>
                                        {{/if}}
                                {{/if}}
 
-                               {{* Butten to open the comment text field *}}
+                               {{* Button to open the comment text field *}}
                                {{if $item.comment}}
-                               <a role="button" class="button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</a>
+                               <button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</button>
                                {{/if}}
 
                                {{* Button for sharing the item *}}
                                {{if $item.vote}}
-                                       {{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}}
-                                       <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
-                                       {{/if}}
                                        {{if $item.vote.share}}
-                                       <a role="button" class="button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
+                                               {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
+                                       <span role="presentation" class="separator">•</span>
+                                               {{/if}}
+                                       <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
                                        {{/if}}
                                {{/if}}
+                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                        </div>
 
                        <div class="wall-item-actions-right pull-right">
                                {{* Event attendance buttons *}}
                                {{if $item.isevent}}
                                <div class="vote-event">
-                                       <a role="button" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
-                                       <a role="button" class="button-event{{if $item.responses.attendno.self}} active{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
-                                       <a role="button" class="button-event{{if $item.responses.attendmaybe.self}} active{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
                                </div>
                                {{/if}}