Commit 458a5f19a1b233fc6c87ac36ddd8fb3a303db56e

Authored by Fernando Ribeiro
1 parent 4109adf0d9

Changed ItemTag and dspace-theme.scss to have a separation in the abstract.

dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java
... ... @@ -50,6 +50,10 @@ import org.dspace.core.I18nUtil;
50 50 import org.dspace.core.PluginManager;
51 51 import org.dspace.core.Utils;
52 52  
  53 +//UM
  54 +import pt.keep.dspace.report.ReportLinkManager;
  55 +//END UM
  56 +
53 57 /**
54 58 * <P>
55 59 * JSP tag for displaying an item.
... ... @@ -524,7 +528,10 @@ public class ItemTag extends TagSupport
524 528 }
525 529 else
526 530 {
527   - out.print("<hr />");
  531 + if(qualifier != null && qualifier.toLowerCase().equals("abstract"))
  532 + out.print("<hr class=\"abstract\" />");
  533 + else
  534 + out.print("<br />");
528 535 }
529 536 }
530 537  
... ... @@ -610,6 +617,11 @@ public class ItemTag extends TagSupport
610 617 + "href=\"" + request.getContextPath() + "/browse?type=" + browseIndex + "&amp;" + argument + "="
611 618 + URLEncoder.encode(value, "UTF-8") + "\">" + Utils.addEntities(values[j].value)
612 619 + "</a>");
  620 + if (browseIndex.equals("author")) {
  621 + if (ConfigurationManager.getBooleanProperty("stats.reports.author.itemshow")) {
  622 + out.print(ReportLinkManager.generateLink(pageContext, (HttpServletRequest)pageContext.getRequest(), value));
  623 + }
  624 + }
613 625 }
614 626 else
615 627 {
... ... @@ -744,7 +756,12 @@ public class ItemTag extends TagSupport
744 756 out.print(collections[i].getHandle());
745 757 out.print("\">");
746 758 out.print(collections[i].getMetadata("name"));
747   - out.print("</a><br/>");
  759 + //out.print("</a><br/>");
  760 + out.print("</a>");
  761 + if (ConfigurationManager.getBooleanProperty("stats.reports.collection.itemshow")) {
  762 + out.print(ReportLinkManager.generateLink(pageContext, (HttpServletRequest)pageContext.getRequest(), collections[i]));
  763 + }
  764 + out.print("<br/>");
748 765 }
749 766  
750 767 out.println("</td></tr>");
... ...
dspace-jspui/src/main/webapp/static/.sass/bower_components/bootstrap-sass/assets/stylesheets/dspace-theme.scss
... ... @@ -295,7 +295,13 @@ span.paneltitle{
295 295 /*
296 296 Separate the elements from abstracts
297 297 */
298   -#content > div > table > tbody > tr > td.metadataFieldValue > hr,
  298 +
  299 +.abstract{
  300 + border: 1px solid #eeeeee;
  301 + margin: 8px 0 8px 0;
  302 +}
  303 +
  304 +/*#content > div > table > tbody > tr > td.metadataFieldValue > hr,
299 305 #content > div > div.row > div.col-md-9 > table > tbody > tr > td.metadataFieldValue > hr,
300 306 #content > div:nth-child(3) > table > tbody > tr:nth-child(7) > td.metadataFieldValue > hr
301 307 #content > div:nth-child(2) > table > tbody > tr:nth-child(4) > td.metadataFieldValue > hr,
... ... @@ -313,7 +319,7 @@ span.paneltitle{
313 319 border: 0;
314 320 margin: 2px 0 2px 0;
315 321 }
316   -
  322 +*/
317 323 /*
318 324 UMINHO STATS
319 325 */
... ...