Changeset 3012365
- Timestamp:
- 12/20/2023 09:30:47 AM (2 years ago)
- Location:
- staff-list/trunk
- Files:
-
- 12 edited
-
admin/autil.php (modified) (1 diff)
-
admin/class-mbox-item.php (modified) (1 diff)
-
admin/mbox-item-img.php (modified) (8 diffs)
-
admin/mbox-item-tabs.php (modified) (1 diff)
-
admin/mbox-tplate-spg-layout.php (modified) (2 diffs)
-
admin/txt-admin.php (modified) (2 diffs)
-
css/admin.css (modified) (2 diffs)
-
inc/cnt-field.php (modified) (2 diffs)
-
inc/cnt-mp.php (modified) (1 diff)
-
inc/spg-a-tag.php (modified) (3 diffs)
-
readme.txt (modified) (2 diffs)
-
staff-list.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
staff-list/trunk/admin/autil.php
r2698048 r3012365 514 514 } 515 515 516 function abcfsl_mbox_autil_input_four_fields( $data1, $data2, $data3, $data4, $w1, $w2, $w3, $w4, $cntrW ){ 517 518 $flexCntr = 'abcflFGCntr'; 519 520 switch ( $cntrW ) { 521 case 50: 522 $flexCntr = 'abcflFGCntr abcflFGCntr50'; 523 break; 524 default: 525 break; 526 } 527 528 // abcflFG80P abcflFG70P abcflFG65P abcflFG33P abcflFG28P abcflFG18P abcflFG16P 529 530 $flexCntrS = abcfl_html_tag( 'div', '', $flexCntr ); 531 $divS1 = abcfl_html_tag( 'div', '', 'abcflFG' . $w1 . 'P' ); 532 $divS2 = abcfl_html_tag( 'div', '', 'abcflFG' . $w2 . 'P' ); 533 $divS3 = abcfl_html_tag( 'div', '', 'abcflFG' . $w3 . 'P' ); 534 $divS4 = abcfl_html_tag( 'div', '', 'abcflFG' . $w4 . 'P' ); 535 $divE = abcfl_html_tag_end( 'div'); 536 537 return $flexCntrS . $divS1 . $data1 . $divE . $divS2 . $data2 . $divE . $divS3 . $data3 . $divE . $divS4 . $data4 . $divE . $divE; 538 } 516 539 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 517 540 -
staff-list/trunk/admin/class-mbox-item.php
r2632766 r3012365 78 78 $this->save_img_S( $postID ); 79 79 abcfl_mbsave_save_txt($postID, 'imgLnkL', '_imgLnkL'); 80 abcfl_mbsave_save_txt($postID, 'sPgLnkCustTxt', '_sPgLnkCustTxt'); 81 80 82 abcfl_mbsave_save_txt($postID, 'imgLnkArgs', '_imgLnkArgs'); 81 83 abcfl_mbsave_save_txt($postID, 'imgLnkClick', '_imgLnkClick'); -
staff-list/trunk/admin/mbox-item-img.php
r2674521 r3012365 182 182 $overTxtI1 = isset( $itemOptns['_overTxtI1'] ) ? esc_attr( $itemOptns['_overTxtI1'][0] ) : ''; 183 183 $overTxtI2 = isset( $itemOptns['_overTxtI2'] ) ? esc_attr( $itemOptns['_overTxtI2'][0] ) : ''; 184 $sPgLnkCustTxt = isset( $itemOptns['_sPgLnkCustTxt'] ) ? esc_attr( $itemOptns['_sPgLnkCustTxt'][0] ) : ''; 184 185 185 186 $sPgLnkTxt = isset( $tplateOptns['_sPgLnkTxt'] ) ? esc_attr( $tplateOptns['_sPgLnkTxt'][0] ) : ''; … … 221 222 222 223 //-- IMG LINK ----------------------------------------------------------- 223 abcfsl_mbox_item_img_link_cntr( $imgLnkL, $sPgLnkNT, $imgLnkLDefault, $imgLnkArgs, $imgLnkClick, $sPgLnkShow, $sPgLnkTxt );224 abcfsl_mbox_item_img_link_cntr( $imgLnkL, $sPgLnkNT, $imgLnkLDefault, $imgLnkArgs, $imgLnkClick, $sPgLnkShow, $sPgLnkTxt, $sPgLnkCustTxt ); 224 225 225 226 //-- OVERLAY ---------------------------------- … … 306 307 307 308 // NEW. Image link container 308 function abcfsl_mbox_item_img_link_cntr( $imgLnkL, $sPgLnkNT, $imgLnkLDefault, $imgLnkArgs, $imgLnkClick, $sPgLnkShow, $sPgLnkTxt ){309 function abcfsl_mbox_item_img_link_cntr( $imgLnkL, $sPgLnkNT, $imgLnkLDefault, $imgLnkArgs, $imgLnkClick, $sPgLnkShow, $sPgLnkTxt, $sPgLnkCustTxt ){ 309 310 310 311 $lnkTplateOptns = abcfsl_mbox_item_img_link_ro_values ( $imgLnkLDefault, $sPgLnkNT, $sPgLnkShow, $sPgLnkTxt ); … … 317 318 $roImgLnkTpltOptns = abcfl_input_txt_readonly('ro_imgLnkTpltOptns', '', $lnkTplateOptns['imgLnkOptns'], abcfsl_txta(22), '', '100%', '', '', 'abcflFldCntr', 'abcflFldLbl'); 318 319 $roTxtLnkTpltOptns = abcfl_input_txt_readonly('ro_txtLnkTpltOptns', '', $lnkTplateOptns['txtLnkOptns'], abcfsl_txta(43), '', '100%', '', '', 'abcflFldCntr', 'abcflFldLbl'); 320 $lnkCustTxt = abcfl_input_txt('sPgLnkCustTxt', '', $sPgLnkCustTxt, abcfsl_txta(900), '', '100%', '', '', 'abcflFldCntr', 'abcflFldLbl'); 321 319 322 $imgLnkL = abcfl_input_txt('imgLnkL', '', $imgLnkL, abcfsl_txta(20). ' URL', '', '100%', '', '', 'abcflFldCntr', 'abcflFldLbl'); 320 323 … … 322 325 $dataR = abcfl_input_txt('imgLnkClick', '', $imgLnkClick, abcfsl_txta(199), '', '100%', '', '', 'abcflFldCntr', 'abcflFldLbl'); 323 326 324 echo abcfsl_mbox_autil_input_three_fields( $roImgLnkTpltOptns, $roTxtLnkTpltOptns, $imgLnkL, 16, 16, 65, 100 ); 327 //echo abcfsl_mbox_autil_input_three_fields( $roImgLnkTpltOptns, $roTxtLnkTpltOptns, $imgLnkL, 8, 16, 70, 100 ); 328 329 //abcfsl_mbox_autil_input_four_fields( $data1, $data2, $data3, $data4, $w1, $w2, $w3, $w4, $cntrW ); 330 echo abcfsl_mbox_autil_input_four_fields( $roImgLnkTpltOptns, $roTxtLnkTpltOptns, $lnkCustTxt, $imgLnkL, 8, 10, 18, 60, 100 ); 325 331 echo abcfl_input_info_lbl( abcfsl_txta(262), 'abcflMTop5 abcflFldHlpUnder', 14 ); 326 332 echo abcfsl_mbox_autil_input_two_fields( $dataL, $dataR, 100, 50 ); … … 331 337 function abcfsl_mbox_item_img_link_ro_values ( $imgLnkLDefault, $sPgLnkNT, $sPgLnkShow, $sPgLnkTxt ){ 332 338 333 // sPgLnkShow : N, S, ST, SPHYB SPGCUST SPCUST.339 // sPgLnkShow Page type: N, S, ST, SPHYB SPGCUST SPCUST. 334 340 // imgLnkLDefault = Link staff image to Single Page (image hyperlink). 335 341 // sPgLnkNT = Open in a new tab or window. … … 358 364 if( $sPgLnkShow == 'SPHYB' ) { 359 365 if( $imgLnkLDefault == 1 ) { 360 $out['imgLnkOptns'] = $pfix . 'H YBRID';366 $out['imgLnkOptns'] = $pfix . 'HB'; 361 367 } 362 368 if( !empty( $sPgLnkTxt ) ) { 363 $out['txtLnkOptns'] = $pfix . 'H YBRID' . $sPgLnkTxt;364 } 369 $out['txtLnkOptns'] = $pfix . 'HB ' . $sPgLnkTxt; 370 } 365 371 return $out; 366 372 } … … 368 374 if( $sPgLnkShow == 'SPCUST' ) { 369 375 if( $imgLnkLDefault == 1 ) { 370 $out['imgLnkOptns'] = $pfix . 'CUST OM';376 $out['imgLnkOptns'] = $pfix . 'CUST'; 371 377 } 372 378 if( !empty( $sPgLnkTxt ) ) { 373 $out['txtLnkOptns'] = $pfix . 'CUST OM' . $sPgLnkTxt;379 $out['txtLnkOptns'] = $pfix . 'CUST ' . $sPgLnkTxt; 374 380 } 375 381 return $out; -
staff-list/trunk/admin/mbox-item-tabs.php
r2517980 r3012365 76 76 $itemOptns = get_post_custom( $postID ); 77 77 78 //print_r($itemOptns); die; 79 78 80 //--- Content START ---------------------- 79 81 //echo abcfl_html_tag( 'div', 'abcfsl_VTabsCntCntr_1', 'abcflVTabsCntCntr' ); -
staff-list/trunk/admin/mbox-tplate-spg-layout.php
r2652405 r3012365 2 2 function abcfsl_mbox_tplate_spg_layout( $tplateOptns, $layout ){ 3 3 4 //error_log( print_r( $tplateOptns, true) ); 5 4 6 echo abcfl_html_tag('div','CN4','inside hidden abcflFadeIn'); 5 6 7 $lstLayout = isset( $tplateOptns['_lstLayout'] ) ? esc_attr( $tplateOptns['_lstLayout'][0] ) : '0'; 7 8 $lstLayoutH = isset( $tplateOptns['_lstLayoutH'] ) ? esc_attr( $tplateOptns['_lstLayoutH'][0] ) : $lstLayout; … … 33 34 34 35 abcfsl_mbox_tplate_spg_layout_css( $tplateOptns ); 35 36 37 36 echo abcfl_html_tag_end('div'); 38 37 } -
staff-list/trunk/admin/txt-admin.php
r2852684 r3012365 804 804 break; 805 805 case 262: 806 $out = __('Global settings (Template - Single Page Options). Custom URL can overwrite some of the global settings', 'staff-list');806 $out = __('Global settings = Template - Single Page Options. Custom options can overwrite global settings', 'staff-list'); 807 807 break; 808 808 case 263: … … 1533 1533 //-------------------------------- 1534 1534 case 900: 1535 $out = __('Custom Text', 'staff-list'); 1536 break; 1537 case 901: 1535 1538 $out = __('', 'staff-list'); 1536 break; 1539 break; 1537 1540 default: 1538 1541 break; -
staff-list/trunk/css/admin.css
r2583860 r3012365 128 128 .abcflFGCntr .abcflFG70P { width: 70%; } 129 129 .abcflFGCntr .abcflFG65P { width: 65%; } 130 .abcflFGCntr .abcflFG60P { width: 60%; } 130 131 .abcflFGCntr .abcflFG33P { width: 33%; } 131 132 .abcflFGCntr .abcflFG28P { width: 28%; } … … 134 135 .abcflFGCntr .abcflFG18P { width: 18%; } 135 136 .abcflFGCntr .abcflFG16P { width: 16%; } 137 .abcflFGCntr .abcflFG10P { width: 10%; } 136 138 .abcflFGCntr .abcflFG8P { width: 8%; } 137 139 -
staff-list/trunk/inc/cnt-field.php
r2674521 r3012365 206 206 } 207 207 208 //== SINGLE PAGE TEXT LINK START ====================================208 //== SINGLE PAGE TEXT LINK START SPTL = Single Page Text Link. ==================================== 209 209 function abcfsl_cnt_field_SPTL( $par, $itemOptns ){ 210 210 211 // Staff member option 211 // Called from: abcfsl_cnt_txt_field. 212 // Out: sPg text link container + content. 213 //------------------------------------------------- 214 // Individual staff memers can hide sPg links. Staff member option. 212 215 $hideSPgLnk = isset( $itemOptns['_hideSPgLnk'] ) ? $itemOptns['_hideSPgLnk'][0] : '0'; 213 216 if( $hideSPgLnk == 1 ) { return ''; } … … 218 221 $parLP['sPgLnkShow'] = $par['sPgLnkShow']; 219 222 $parLP['sPgLnkNT'] = $par['sPgLnkNT']; 220 $parLP['lineTxt'] = $par['lineTxt']; 223 $parLP['lineTxt'] = $par['lineTxt']; //$tplateOptns['_sPgLnkTxt'] 221 224 $parLP['imgLnkLDefault'] = $par['imgLnkLDefault']; 222 225 223 $itemTxt = $par['lineTxt']; 226 // sPg text link can use template's setting or staff member custom text. 227 // When both of them are empty, no link will show up. 228 //$itemTxt = $par['lineTxt']; 229 $itemTxtCust = isset( $itemOptns['_sPgLnkCustTxt'] ) ? $itemOptns['_sPgLnkCustTxt'][0] : ''; 230 231 if( !abcfl_html_isblank( $itemTxtCust ) ) { 232 //$itemTxt = $itemTxtCust; 233 $parLP['lineTxt'] = $itemTxtCust; 234 } 235 //------------------------------------------------- 236 // Changed. Link text is required now. 237 //if( abcfl_html_isblank( $itemTxt ) ) { return ''; } 238 if( abcfl_html_isblank( $parLP['lineTxt'] ) ) { return ''; } 224 239 //------------------------------------------------- 225 240 $lnkParts = abcfsl_spg_a_tag_lnk_parts( $parLP, $itemOptns, false ); 226 241 if( empty( $lnkParts['href'] ) ) { return ''; } 227 //------------------------------------------------- 228 // Changed. Link text is required now. 229 //if( abcfl_html_isblank( $itemTxt ) ) { $itemTxt = $lnkParts['href']; } 230 if( abcfl_html_isblank( $itemTxt ) ) { return ''; } 231 $aTag = abcfl_html_a_tag_nb( $lnkParts['href'], $itemTxt, $lnkParts['target'], $par['lnkCls'], $par['lnkStyle'], '', $lnkParts['onclick'], $lnkParts['args'] ); 242 243 //------------------------------------------------- 244 //$aTag = abcfl_html_a_tag_nb( $lnkParts['href'], $itemTxt, $lnkParts['target'], $par['lnkCls'], $par['lnkStyle'], '', $lnkParts['onclick'], $lnkParts['args'] ); 245 $aTag = abcfl_html_a_tag_nb( $lnkParts['href'], $parLP['lineTxt'], $lnkParts['target'], $par['lnkCls'], $par['lnkStyle'], '', $lnkParts['onclick'], $lnkParts['args'] ); 232 246 233 247 $cntrS = abcfl_html_tag( $par['tagType'], '', $par['tagCls'] . ' ' . $par['fieldType'], $par['tagStyle'] ); -
staff-list/trunk/inc/cnt-mp.php
r2886080 r3012365 19 19 //----------------------------------------------------------- 20 20 21 // Checkbox Create link to single page. 21 // Checkbox Create link to single page. MP field content can be linked to a single page. 22 22 $sPgLnkMP = isset( $tplateOptns['_sPgLnkMP_' . $F] ) ? $tplateOptns['_sPgLnkMP_' . $F][0] :'0'; 23 23 if( $sPgLnkMP == 1 ) { -
staff-list/trunk/inc/spg-a-tag.php
r2683032 r3012365 36 36 $lnkParts['args'] = ''; 37 37 38 //== If no hyperlink - exit =========================================38 //== If show no hyperlink - exit ========================================= 39 39 $parLP = abcfsl_spg_a_tag_get_lnk_parts( $parLP, $itemOptns, $isImgLink ); 40 40 if( !$parLP['showLnk'] ) { return $lnkParts; } 41 41 //========================================================================= 42 42 43 // Hybrid = ST, SPGHYB. Custom = SPGCUST, SPCUST. 43 // Hybrid = ST, SPGHYB. 44 // Custom = SPGCUST, SPCUST. 44 45 switch ( $parLP['sPgLnkShow'] ) { 45 46 case 'ST': … … 118 119 if( $parLP['sPgLnkNT'] == 1 ) { $parLP['target'] = '_blank'; } 119 120 120 // Page type121 // Show link: N, Y, SPHYB, SPCUST 121 122 $showLink = $parLP['sPgLnkShow']; 122 123 if( $showLink == 'ST') { $showLink = 'SPHYB'; } … … 192 193 } 193 194 194 // Hybrid page has to have custom URL or single page URL.195 // Hybrid page URL can't be empty. It has to have custom URL or single page URL. 195 196 if( empty( $parLP['sPageUrl'] ) ) { 196 197 return abcfsl_spg_a_tag_img_lnk_parts_builder( $parLP['sPageUrl'], $parLP['target'], $itemOptns, $isImgLink ); -
staff-list/trunk/readme.txt
r2984734 r3012365 6 6 Tested up to: 6.4 7 7 Requires PHP: 5.6 8 Stable tag: 1.7. 38 Stable tag: 1.7.4 9 9 License: GPLv2 or later 10 10 License URI: https://www.gnu.org/licenses/gpl-3.0.html … … 128 128 129 129 == Changelog == 130 131 = 1.7.4 20231220 132 * Update: Option to replace template's single page text link with staff member custom text. 133 * Update: Tested with WP 6.4. 130 134 131 135 = 1.7.3 20231025 -
staff-list/trunk/staff-list.php
r2984726 r3012365 11 11 Requires at least: 4.9 12 12 Requires PHP: 5.6 13 Version: 1.7. 313 Version: 1.7.4 14 14 ------------------------------------------------------------------------ 15 15 Copyright 2009-2021 abcFolio. … … 37 37 final class ABCF_Staff_List { 38 38 39 private static $instance; 39 private static $instance; 40 40 public $pluginSlug = 'abcfolio-staff-list'; 41 public $pluginVersion = '1.7. 3';41 public $pluginVersion = '1.7.4'; 42 42 public $prefix = 'abcfsl'; 43 43 … … 121 121 require_once ABCFSL_PLUGIN_DIR . 'library/abcfl-html.php'; 122 122 require_once ABCFSL_PLUGIN_DIR . 'library/abcfl-util.php'; 123 124 //require_once ABCFSL_PLUGIN_DIR . 'deprecated/inc.php'; 123 125 124 126 //if( $this->pluginSlug == 'abcfolio-staff-list' ) {
Note: See TracChangeset
for help on using the changeset viewer.