Changeset 32746
- Timestamp:
- Mar 21, 2022, 11:01:30 AM (2 years ago)
- Location:
- extensions/AddUsersNotes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AddUsersNotes/js/usersnotes.js
r32742 r32746 4 4 container.attr('key', user_index); 5 5 container.find(".user-container-username span").html(user.username); 6 container.find(".user-container-usernotes span").html(user.usernotes); 6 if (user.usernotes) { 7 container.find(".user-notes-icon").tipTip({content:`${user.usernotes}`}); 8 } else { 9 container.find(".user-notes-icon").hide(); 10 } 7 11 container.find(".user-container-initials span").html(get_initials(user.username)).addClass(color_icons[user.id % 5]); 8 12 container.find(".user-container-status span").html(user.status); … … 38 42 39 43 var usernotes_to_display = user_to_edit.usernotes ? user_to_edit.usernotes : ''; 40 if (usernotes_to_display.length > 70) {41 usernotes_to_display = usernotes_to_display.substring(0, 70) + '<span title="' + user_to_edit.usernotes + '">...</span>'42 }43 44 44 // if (usernotes_to_display.length > 70) { 45 // usernotes_to_display = usernotes_to_display.substring(0, 70) + '<span title="' + user_to_edit.usernotes + '">...</span>' 46 // } 47 pop_in.find('.usernotes-title').html(usernotes_to_display); 48 pop_in.find('.user-property-usernotes-change input').val(user_to_edit.usernotes); 45 49 } 46 50 … … 48 52 $('.edit-usernotes').click(function () { 49 53 $('.user-property-usernotes').hide(); 54 $(this).hide(); 50 55 $('.user-property-usernotes-change').show().css('display', 'flex'); 51 56 }) … … 54 59 //possibly reset input value 55 60 $('.user-property-usernotes').show(); 61 $('.edit-usernotes').show(); 56 62 $('.user-property-usernotes-change').hide(); 57 63 }) 64 65 jQuery('.tiptip').tipTip({ 66 delay: 0, 67 fadeIn: 200, 68 fadeOut: 200 69 }); 58 70 }); 59 71 60 72 function fill_user_edit_update(user_to_edit, pop_in) { 61 73 pop_in.find('.update-user-button').unbind("click").click( 62 74 user_to_edit.id === guest_id ? update_guest_info : update_user_info); 63 75 pop_in.find('.edit-username-validate').unbind("click").click(update_user_username); 64 76 pop_in.find('.edit-password-validate').unbind("click").click(update_user_password); 65 pop_in.find('.edit-usernotes-validate').unbind("click").click(update_user_usernotes);77 pop_in.find('.edit-usernotes-validate').unbind("click").click(update_user_usernotes); 66 78 pop_in.find('.delete-user-button').unbind("click").click(function () { 67 79 $.confirm({ … … 111 123 $('.user-property-usernotes').show(); 112 124 $('.user-property-usernotes-change').hide(); 125 $('.edit-usernotes').show(); 113 126 } 114 127 } -
extensions/AddUsersNotes/main.inc.php
r32697 r32746 51 51 52 52 53 53 // add "?" next to username for usernotes 54 $search = '<span><!-- name --></span>'; 55 56 $replace = '<i class="user-notes-icon icon-help-circled tiptip"> </i>'; 57 58 $content = str_replace($search, $search.$replace, $content); 59 54 60 // add the "Notes" column in the user table 55 $search = '<!-- groups -->56 <div class="user-header-col user-header-groups">57 <span>{\'Groups\'|@translate}</span>58 </div>';59 $content = str_replace($search, $search.'<!-- Notes -->60 <div class="user-header-col user-header-usernotes">61 <span>{\'Notes\'|@translate}</th></span>62 </div>'63 , $content);61 // $search = '<!-- groups --> 62 // <div class="user-header-col user-header-groups"> 63 // <span>{\'Groups\'|@translate}</span> 64 // </div>'; 65 // $content = str_replace($search, $search.'<!-- Notes --> 66 // <div class="user-header-col user-header-usernotes"> 67 // <span>{\'Notes\'|@translate}</th></span> 68 // </div>' 69 // , $content); 64 70 65 71 // add the "Notes" 66 $search = '<div class="user-col user-container-groups">67 <!-- groups -->68 </div>';69 $replace = ' <div class="user-col user-container-usernotes">70 <span><!-- usernotes --></span>71 </div>';72 $content = str_replace($search, $search.$replace, $content);72 // $search = '<div class="user-col user-container-groups"> 73 // <!-- groups --> 74 // </div>'; 75 // $replace = ' <div class="user-col user-container-usernotes"> 76 // <span><!-- usernotes --></span> 77 // </div>'; 78 // $content = str_replace($search, $search.$replace, $content); 73 79 74 80 // add the "Notes" field in user profile form … … 117 123 <span class="icon-calendar"></span> 118 124 <span class="user-property-last-visit"><!-- Last Visit date XX/XX/XXXX --></span> 119 </div>120 </div>121 <div class="properties-container">122 <div class="user-property-column-title">123 <p>{\'Properties\'|@translate}</p>124 </div>125 <div class="user-property-email">126 <p class="user-property-label">{\'Email Adress\'|@translate}</p>127 <input type="text" class="user-property-input" value="contact@jessy-pinkman.com" disabled="false"/>128 </div>129 <div class="user-property-status">130 <p class="user-property-label">{\'Status\'|@translate}131 <span class="icon-help-circled"132 title="<div class=\'tooltip-status-content\'>133 <div class=\'tooltip-status-row\'><span class=\'tooltip-col1\'>{\'user_status_webmaster\'|translate}</span><span class=\'tooltip-col2\'>{\'Has access to all administration functionnalities. Can manage both configuration and content.\'|translate}</span></div>134 <div class=\'tooltip-status-row\'><span class=\'tooltip-col1\'>{\'user_status_admin\'|translate}</span><span class=\'tooltip-col2\'>{\'Has access to administration. Can only manage content: photos/albums/users/tags/groups.\'|translate}</span></div>135 <div class=\'tooltip-status-row\'><span class=\'tooltip-col1\'>{\'user_status_normal\'|translate}</span><span class=\'tooltip-col2\'>{\'No access to administration, can see private content with appropriate permissions.\'|translate}</span></div>136 <div class=\'tooltip-status-row\'><span class=\'tooltip-col1\'>{\'user_status_generic\'|translate}</span><span class=\'tooltip-col2\'>{\'Can be shared by several individuals without conflict (they cannot change the password).\'|translate}</span></div>137 <div class=\'tooltip-status-row\'><span class=\'tooltip-col1\'>{\'user_status_guest\'|translate}</span><span class=\'tooltip-col2\'>{\'Equivalent to deactivation. The user is still in the list, but can no longer log in.\'|translate}</span></div>138 </div">139 </span>140 </p>141 <div class="user-property-select-container">142 <select name="status" class="user-property-select">143 <option value="webmaster">{\'user_status_webmaster\'|@translate}</option>144 <option value="admin">{\'user_status_admin\'|@translate}</option>145 <option value="normal">{\'user_status_normal\'|@translate}</option>146 <option value="generic">{\'user_status_generic\'|@translate}</option>147 <option value="guest">{\'user_status_guest\'|@translate} ({\'Deactivated\'|@translate})</option>148 </select>149 </div>150 </div>151 <div class="user-property-level">152 <p class="user-property-label">{\'Privacy level\'|@translate}</p>153 <div class="user-property-select-container">154 <select name="privacy" class="user-property-select">155 <option value="0">{\'Level 0\'|@translate}</option>156 <option value="1">{\'Level 1\'|@translate}</option>157 <option value="2">{\'Level 2\'|@translate}</option>158 <option value="4">{\'Level 4\'|@translate}</option>159 <option value="8">{\'Level 8\'|@translate}</option>160 </select>161 </div>162 </div>163 <div class="user-property-group-container">164 <p class="user-property-label">{\'Groups\'|@translate}</p>165 <div class="user-property-select-container user-property-group">166 <select class="user-property-select" data-selectize="groups" placeholder="{\'Select groups or type them\'|translate}"167 name="group_id[]" multiple style="box-sizing:border-box;"></select>168 </div>169 125 </div>'; 170 $replace = '<p class="user-property-label ">{\'Notes\'|@translate}</p>126 $replace = '<p class="user-property-label usernotes-label-edit">{\'Notes\'|@translate}<span class="edit-usernotes icon-pencil"></span></p> 171 127 <div class="user-property-usernotes"> 172 128 <span class="usernotes-title"><!-- usernotes --></span> 173 <span class="edit-usernotes icon-pencil"></span>174 129 </div> 175 130 <div class="user-property-usernotes-change"> … … 196 151 margin-bottom:34px; 197 152 height:30px; 153 width: 100%; 154 padding: 8px; 155 background-color: #F3F3F3; 156 padding-bottom: 16px; 198 157 } 199 158 … … 217 176 font-size:1.4em; 218 177 cursor:pointer; 178 color: #A4A4A4 !important; 219 179 } 220 180 .edit-usernotes-cancel { … … 233 193 font-size:1.4em; 234 194 } 195 .usernotes-title { 196 color: #353535; 197 display: flex; 198 justify-content: left; 199 200 --line-height: 1.4; 201 --num-lines: 2; 202 line-height: var(--line-height); 203 display: block; 204 height: calc(1em * var(--line-height) * var(--num-lines)); 205 display: -webkit-box; 206 -webkit-line-clamp: var(--num-lines); 207 -webkit-box-orient: vertical; 208 overflow: hidden; 209 text-overflow: ellipsis; 210 margin-bottom: 5px; 211 } 235 212 .usernotes-property-input.user-property-input-usernotes { 236 213 border: solid 2px #ffa744; … … 255 232 text-overflow: ellipsis; 256 233 } 257 234 .usernotes-label-edit { 235 align-self: flex-start; 236 } 237 238 .user-property-register-visit { 239 margin-top: -15px; 240 } 258 241 '; 259 242 $content = str_replace($search, $replace.$search, $content);
Note: See TracChangeset
for help on using the changeset viewer.