From 07602737a4cbbb3ab0d40d750be5849cd3906026 Mon Sep 17 00:00:00 2001 From: pvillanueva01 Date: Wed, 2 Dec 2015 14:21:53 -0500 Subject: [PATCH] Experts Pluslet styling in guide admin page, UM theme, default theme and cleanwhite theme --- assets/css/admin/admin_styles.css | 49 ++++++++++++++++++ assets/css/public/cleanwhite.css | 54 ++++++++++++++++++++ assets/css/public/default.css | 52 +++++++++++++++++++ assets/css/public/um.css | 5 ++ assets/js/guides/pluslet.js | 7 +-- lib/SubjectsPlus/Control/Pluslet/Experts.php | 40 ++++++--------- 6 files changed, 181 insertions(+), 26 deletions(-) diff --git a/assets/css/admin/admin_styles.css b/assets/css/admin/admin_styles.css index 7e35d8090..10d5affba 100644 --- a/assets/css/admin/admin_styles.css +++ b/assets/css/admin/admin_styles.css @@ -1722,10 +1722,12 @@ h4.toc-heading {margin: 6px 0;} .articlesplus-search {margin: 0 10px;} + /* Book Search Pluslet- default */ .book-search {margin: 0 10px;} + /* Google Search Pluslet */ .google-search {margin: 0 10px;} @@ -1754,6 +1756,53 @@ h4.guide-select-heading {margin: 6px 0;} +/*Experts Pluslet, circles style */ +.find-expert-area-circ {padding:0;} + +.expert-list-circ {list-style-type: none; margin:15px 0 15px 0; padding:0 !important;} +.expert-list-circ li { + display:inline-block; + margin: 0 0 10px 0; + padding:0; + width:120px; + position:relative; +} + +.expert-list-circ .expert-img {display: block; text-align: center;} +.expert-list-circ .expert-img img.staff_photo_full {padding:0; background-color: transparent; width: 80px; height: 80px; border: none; border-radius: 50%;} +.expert-list-circ .expert-label {display: block; text-align: center; padding:3px 0; width:100%; font-size:0.9em; line-height: 1.1em;} +.expert-list-circ .expert-title {display: block; font-size:0.95em; line-height: 1.2em; padding:5px; color:#FFF;} +.expert-list-circ .expert-subjects {display: block; text-align: left; padding:5px; font-size: 0.85em; line-height: 1.2em; color: #FFF;} + +/*Expert tooltips */ + +.expert-list-circ li:hover .expert-tooltip {display:block;} + +.expert-tooltip { + position:absolute; + top:-20px; + right:92%; + display:none; + margin:5px; + width:175px; + min-height:120px; + border-radius: 2px; + background-color: rgba(102, 102, 102, 0.9); + z-index:99999; + padding: 5px; + color: #FFF; +} + +.expert-tooltip:before { + content:"\A"; + border-style: solid; + border-width: 15px 0 15px 15px; + border-color: transparent transparent transparent rgba(102, 102, 102, 0.9); + position: absolute; + right: -15px; + top:35%; +} + diff --git a/assets/css/public/cleanwhite.css b/assets/css/public/cleanwhite.css index 76244a96e..d07929568 100644 --- a/assets/css/public/cleanwhite.css +++ b/assets/css/public/cleanwhite.css @@ -1322,6 +1322,60 @@ h4.toc-heading {margin: 6px 0; font-weight: bold;} h4.guide-select-heading {margin: 6px 0; font-weight: bold;} .pluslet_container .pure-form select {width:200px !important;} +/* HTML5 Video Pluslet - Front-end */ +.video-container {margin-bottom: 10px;} + + + +/*Experts Pluslet - Front-end */ +.type-experts .pluslet_body {overflow: initial !important;} + +.find-expert-area-circ {padding:0;} + +.expert-list-circ {list-style-type: none; margin:15px 0 15px 0; padding:0 !important;} +.expert-list-circ li { + display:inline-block; + margin: 0 0 10px 0; + padding:0; + width:120px; + position:relative; +} + +.expert-list-circ .expert-img {display: block; text-align: center;} +.expert-list-circ .expert-img img.staff_photo_full {padding:0; background-color: transparent; width: 80px; height: 80px; border: none; border-radius: 50%;} +.expert-list-circ .expert-label {display: block; text-align: center; padding:3px 0; width:100%; font-size:0.9em; line-height: 1.1em;} +.expert-list-circ .expert-title {display: block; font-size:0.95em; line-height: 1.2em; padding:5px; color:#FFF;} +.expert-list-circ .expert-subjects {display: block; text-align: left; padding:5px; font-size: 0.85em; line-height: 1.2em; color: #FFF;} + +/*Expert tooltips */ + +.expert-list-circ li:hover .expert-tooltip {display:block;} + +.expert-tooltip { + position:absolute; + top:-20px; + right:92%; + display:none; + margin:5px; + width:175px; + min-height:120px; + border-radius: 2px; + background-color: rgba(102, 102, 102, 0.9); + z-index:99999; + padding: 5px; + color: #FFF; +} + +.expert-tooltip:before { + content:"\A"; + border-style: solid; + border-width: 15px 0 15px 15px; + border-color: transparent transparent transparent rgba(102, 102, 102, 0.9); + position: absolute; + right: -15px; + top:35%; +} + /* Media Queries */ diff --git a/assets/css/public/default.css b/assets/css/public/default.css index b65e7fc72..89d29c922 100644 --- a/assets/css/public/default.css +++ b/assets/css/public/default.css @@ -1328,6 +1328,58 @@ h4.guide-select-heading {margin: 6px 0; font-weight: bold;} +/*Experts Pluslet - Front-end */ +.type-experts .pluslet_body {overflow: initial !important;} + +.find-expert-area-circ {padding:0;} + +.expert-list-circ {list-style-type: none; margin:15px 0 15px 0; padding:0 !important;} +.expert-list-circ li { + display:inline-block; + margin: 0 0 10px 0; + padding:0; + width:120px; + position:relative; +} + +.expert-list-circ .expert-img {display: block; text-align: center;} +.expert-list-circ .expert-img img.staff_photo_full {padding:0; background-color: transparent; width: 80px; height: 80px; border: none; border-radius: 50%;} +.expert-list-circ .expert-label {display: block; text-align: center; padding:3px 0; width:100%; font-size:0.9em; line-height: 1.1em;} +.expert-list-circ .expert-title {display: block; font-size:0.95em; line-height: 1.2em; padding:5px; color:#FFF;} +.expert-list-circ .expert-subjects {display: block; text-align: left; padding:5px; font-size: 0.85em; line-height: 1.2em; color: #FFF;} + +/*Expert tooltips */ + +.expert-list-circ li:hover .expert-tooltip {display:block;} + +.expert-tooltip { + position:absolute; + top:-20px; + right:92%; + display:none; + margin:5px; + width:175px; + min-height:120px; + border-radius: 2px; + background-color: rgba(102, 102, 102, 0.9); + z-index:99999; + padding: 5px; + color: #FFF; +} + +.expert-tooltip:before { + content:"\A"; + border-style: solid; + border-width: 15px 0 15px 15px; + border-color: transparent transparent transparent rgba(102, 102, 102, 0.9); + position: absolute; + right: -15px; + top:35%; +} + + + + /* Media Queries */ diff --git a/assets/css/public/um.css b/assets/css/public/um.css index 4ff00aa90..eee65c0d9 100644 --- a/assets/css/public/um.css +++ b/assets/css/public/um.css @@ -1610,6 +1610,11 @@ img.center-image { top:35%; } +/*Experts Pluslet - Front-end */ +.type-experts .pluslet_body {overflow: initial !important;} +.type-experts .find-expert-area-circ {padding:0; margin: 0;} +.type-experts .expert-list-circ {margin: 15px 0 !important;} +.type-experts .expert-list-circ li {display: inline-block !important; margin: 0 0 10px !important;} /* ////////////////// diff --git a/assets/js/guides/pluslet.js b/assets/js/guides/pluslet.js index 2a65be0dc..2dfa16191 100644 --- a/assets/js/guides/pluslet.js +++ b/assets/js/guides/pluslet.js @@ -9,10 +9,11 @@ function pluslet() { var myPluslet = { settings : { - hideBodyContent : ['.pluslet.type-heading','.pluslet.type-worldcat' ,'.pluslet.type-catalog','.pluslet.type-relguide', '.pluslet.type-articleplus','.pluslet.type-toc','.pluslet.type-googlebooks','.pluslet.type-googlescholar','.pluslet.type-googlesearch','.pluslet.type-guideselect','.pluslet.type-newdbs','.pluslet.type-guidesearch','.pluslet.type-newguides'], - hideLinksNewTab : ['.pluslet.type-heading','.pluslet.type-video','.pluslet.type-worldcat','.pluslet.type-catalog','.pluslet.type-relguide','.pluslet.type-articleplus','.pluslet.type-toc','.pluslet.type-googlebooks','.pluslet.type-googlescholar','.pluslet.type-googlesearch','.pluslet.type-guideselect','.pluslet.type-guidesearch'], + hideBodyContent : ['.pluslet.type-heading','.pluslet.type-worldcat' ,'.pluslet.type-catalog','.pluslet.type-relguide', '.pluslet.type-articleplus','.pluslet.type-toc','.pluslet.type-googlebooks','.pluslet.type-googlescholar','.pluslet.type-googlesearch','.pluslet.type-guideselect','.pluslet.type-newdbs','.pluslet.type-guidesearch','.pluslet.type-newguides','.pluslet.type-experts', '.pluslet.type-guidelist', '.pluslet.type-collectionlist'], + hideLinksNewTab : ['.pluslet.type-heading','.pluslet.type-video','.pluslet.type-worldcat','.pluslet.type-catalog','.pluslet.type-relguide','.pluslet.type-articleplus','.pluslet.type-toc','.pluslet.type-googlebooks','.pluslet.type-googlescholar','.pluslet.type-googlesearch','.pluslet.type-guideselect','.pluslet.type-guidesearch', '.pluslet.type-experts', '.pluslet.type-collectionlist'], hideTitleBar : ['.pluslet.type-heading','.pluslet.type-toc'], - hideMakeFavorite :['.pluslet.type-worldcat','.pluslet.type-catalog','.pluslet.type-articleplus','.pluslet.type-relguide','.pluslet.type-googlebooks','.pluslet.type-googlescholar','.pluslet.type-googlesearch','.pluslet.type-guideselect','.pluslet.type-newdbs','.pluslet.type-guidesearch','.pluslet.type-newguides'] + hideMarkFavorite :['.pluslet.type-worldcat','.pluslet.type-catalog','.pluslet.type-articleplus','.pluslet.type-relguide', + '.pluslet.type-googlebooks','.pluslet.type-googlescholar','.pluslet.type-googlesearch','.pluslet.type-guideselect','.pluslet.type-newdbs','.pluslet.type-guidesearch','.pluslet.type-newguides','.pluslet.type-experts', '.pluslet.type-guidelist', '.pluslet.type-collectionlist'] }, strings : { diff --git a/lib/SubjectsPlus/Control/Pluslet/Experts.php b/lib/SubjectsPlus/Control/Pluslet/Experts.php index cc1302bcd..be5f12c3d 100644 --- a/lib/SubjectsPlus/Control/Pluslet/Experts.php +++ b/lib/SubjectsPlus/Control/Pluslet/Experts.php @@ -56,42 +56,36 @@ public function outputExperts() { AND s.active = 1 AND sub.active = 1 AND ptags LIKE '%librarian%' - GROUP BY s.staff_id - ORDER BY RAND() - LIMIT 0,3"; + GROUP BY s.staff_id + ORDER BY RAND() + LIMIT 0,4"; $expertArray = $this->db->query($q); - // init our columns - $col_1 = "
"; - $col_2 = "
"; - // the text that shows up in the blank box - $bonus_text = "
" . _("Need help? Ask an expert."); + // init list item + $expert_item = ""; + + // additional text + $bonus_text = _("Need help? Ask an expert."); - $row_count = 0; foreach ($expertArray as $key => $value) { - $image = getHeadshot($value['email'], "smaller","staff_photo"); - $profile = "
" . $image . "
" . $value['fullname'] . "
"; + $exp_image = getHeadshotFull($value['email']); + + $librarian_email = $value['email']; + $name_id = explode("@", $librarian_email); - // this is to display two cols, col_1 with expert then text, col_2 with expert then expert - if ($row_count % 2 == 0) { - $col_2 .= $profile; - } else { - $col_1 .= $profile; - } + $exp_profile = "
  • " . $exp_image . "
    " . $value['fullname'] . "
    " . $value['title'] ."
    Subjects: " . $value['subject'] ." ...
    • "; - $row_count++; + $expert_item .= $exp_profile; } - - $col_1 .= "$bonus_text
    "; - $col_2 .= "
    "; + $guide_experts = "$expert_item"; - $list_guides = "
    $col_1 $col_2
    "; + $list_guide_experts = "
    $bonus_text
    "; - return $list_guides; + return $list_guide_experts; }