Merge pull request #192 from subjectsplus/feature-admin-pluslets-ui

Miscellaneous fixes from demo
subjectsplus · Sep 22, 2015 · 75dc2e3 · 75dc2e3
2 parents 1712fb4 + 570a657
commit 75dc2e3
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 24 deletions.
diff --git a/assets/css/admin/admin_styles.css b/assets/css/admin/admin_styles.css
@@ -1141,6 +1141,13 @@ li.fav-box-item:hover::before {color: #C03957;}
   list-style-position: inside;
 }
 
+.portal-column-0 .pluslet .pluslet_body img,
+.portal-column-1 .pluslet .pluslet_body img,
+.portal-column-2 .pluslet .pluslet_body img{
+  height: auto !important;
+  max-width: 100%;
+}
+
 .box_settings {
   padding: 10px;
   text-transform: none;

diff --git a/control/guides/flyouts/analytics.php b/control/guides/flyouts/analytics.php
@@ -32,26 +32,26 @@
 
 	<script>             
 
-                $('.tab-clicks').empty();
-                     
-				$.get("./helpers/stats_data.php?short_form=<?php echo scrubData($_COOKIE['our_shortform']); ?>", function(data) {
+	    $('.tab-clicks').empty();
+	         
+		$.get("./helpers/stats_data.php?short_form=<?php echo scrubData($_COOKIE['our_shortform']); ?>", function(data) {
 
-					console.log(data);
-					console.log(data.total_views);
-				$(".total-views-count").html(data.total_views);
+			console.log(data);
+			console.log(data.total_views);
+		$(".total-views-count").html(data.total_views);
 
 
-				if (data.tab_clicks[key]) {
-$('.tab-click-header').show();
-								for (key in data.tab_clicks) {
+		if (data.tab_clicks[key]) {
+			$('.tab-click-header').show();
+						for (key in data.tab_clicks) {
 
-					console.log(key);
-					
-					$(".tab-clicks").append("<li class='tab-click'>" + key + " : " + data.tab_clicks[key] + "</li>");
-					
-				}
+			console.log(key);
+
+			$(".tab-clicks").append("<li class='tab-click'>" + key + " : " + data.tab_clicks[key] + "</li>");
+
+		}
 
-				}
+		}
 
-				});
-            </script>
+		});
+	</script>
diff --git a/control/guides/guide.php b/control/guides/guide.php
@@ -1151,7 +1151,7 @@ function fixFlashFOUC() {
 //Expand/Collapse Trigger CSS for all Pluslets on a Tab
 
   $( "#expand_tab" ).click(function() { 
-    $(this).find('i').toggleClass('fa-chevron-down fa-chevron-up');
+    $(this).find('i').toggleClass('fa-chevron-up fa-chevron-down');
     $('.pluslet_body').toggle();
     $('.pluslet_body').toggleClass('pluslet_body_closed');
   });

diff --git a/control/guides/guide_copy.php b/control/guides/guide_copy.php
@@ -75,7 +75,7 @@
 		$('.metadata-url').show();
 		$('.metadata-url').attr('href', "metadata.php?subject_id=" + data);
 
-		window.location.href = "<?php echo getControlURL(); ?>" + "/guides/metadata.php?subject_id=" + data;
+		window.location.href = "<?php echo getControlURL(); ?>" + "guides/metadata.php?subject_id=" + data;
 
 	});
 

diff --git a/lib/SubjectsPlus/Control/Guide.php b/lib/SubjectsPlus/Control/Guide.php
@@ -909,7 +909,7 @@ public function outputNavTabs( $lstrFilter = "" )
         $tabs .= $this->_isAdmin ? "<span class='alter_tab' role='presentation'><i class=\"fa fa-cog\"></i></span></li>" : "</li>";
         }
 
-        $tabs .= "<li id=\"expand_tab\"><i class=\"fa fa-chevron-down\"></i></li>"; //place collapse/expand trigger here
+        $tabs .= "<li id=\"expand_tab\"><i class=\"fa fa-chevron-up\"></i></li>"; //place collapse/expand trigger here
         $tabs .= "</ul>"; // close out our tabs
 
         $tabs .= $this->_isAdmin ? "" : "<div id=\"shadowkiller\"></div>"; // this div allows me to cover bottom of box-shadow on tabs.  crazy, bien sur

diff --git a/lib/SubjectsPlus/Control/Pluslet/5.php b/lib/SubjectsPlus/Control/Pluslet/5.php
@@ -32,7 +32,7 @@ public function output($action="", $view="public") {
         // example form action:  http://icarus.ithaca.edu/cgi-bin/Pwebrecon.cgi?
         $this->_body = '
             <div class="book-search">
-            <form action="" method="get" name="querybox" id="querybox" class="pure-form">
+            <form action="" method="get" name="querybox" id="querybox" class="pure-form" target="_blank">
             <fieldset>
             <input type="hidden" value="local" name="DB" />
             <select name="Search_Code" class="search_smaller">

diff --git a/lib/SubjectsPlus/Control/Pluslet/views/ArticlesPlus.html b/lib/SubjectsPlus/Control/Pluslet/views/ArticlesPlus.html
@@ -1,5 +1,5 @@
 <div class="articlesplus-search">
-        <form action="http://miami.summon.serialssolutions.com/search" method="GET" id="summon_search2" class="pure-form">
+        <form action="http://miami.summon.serialssolutions.com/search" method="GET" id="summon_search2" class="pure-form" target="_blank">
             <fieldset>
                 <legend>Find items in Articles+</legend>
                 <input type="hidden" value="ContentType,Newspaper Article, true" name="">

diff --git a/lib/SubjectsPlus/Control/Pluslet/views/Catalog.html b/lib/SubjectsPlus/Control/Pluslet/views/Catalog.html
@@ -1,5 +1,5 @@
 <div class="catalog-search">
-<form action="http://catalog.library.miami.edu/search/" method="get" name="search" id="search" class="pure-form">
+<form action="http://catalog.library.miami.edu/search/" method="get" name="search" id="search" class="pure-form" target="_blank">
 
 <input type="hidden" id="iiiFormHandle_1">
 

diff --git a/lib/SubjectsPlus/Control/Pluslet/views/WorldCat.html b/lib/SubjectsPlus/Control/Pluslet/views/WorldCat.html
@@ -92,7 +92,7 @@
 
 <div id="div-search">
 
-    <form name="wcfw" id="wcfw" method="get" accept-charset="UTF-8" action="https://www.worldcat.org/search" target="_top" onsubmit="return checkSearchForm()" class="pure-form">    
+    <form name="wcfw" id="wcfw" method="get" accept-charset="UTF-8" action="https://www.worldcat.org/search" target="_blank" onsubmit="return checkSearchForm()" class="pure-form">    
 
         <fieldset>
             <input type="hidden" name="qt" value="affiliate_wc_org_all">