Changeset 6155 for SRUAggregator


Ignore:
Timestamp:
04/22/15 12:14:45 (9 years ago)
Author:
emanuel.dima@uni-tuebingen.de
Message:
  1. beta-41: round, clariny icons in the 'more services' + build rpm option
Location:
SRUAggregator/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • SRUAggregator/trunk/build.sh

    r6154 r6155  
    99BUILD_JSX=1
    1010BUILD_JAR=
    11 BUILD_GO=
     11BUILD_RPM=
    1212RUN_JAR=
    1313RUN_JAR_PRODUCTION=
     
    2626    --jar)
    2727    BUILD_JAR=1
     28    ;;
     29    --rpm)
     30    BUILD_RPM=1
     31    BUILD_JAR=
    2832    ;;
    2933    --run)
     
    7781fi
    7882
     83if [ $BUILD_RPM ]
     84then
     85        echo; echo "---- mvn clean package jdeb:jdeb rpm:rpm"
     86        mvn clean package jdeb:jdeb rpm:rpm
     87fi
     88
    7989if [ $RUN_JAR ]
    8090then
  • SRUAggregator/trunk/pom.xml

    r6154 r6155  
    88        <groupId>eu.clarin.sru.fcs</groupId>
    99        <artifactId>aggregator</artifactId>
    10         <version>2.0.0-beta-40</version>
     10        <version>2.0.0-beta-41</version>
    1111        <name>FCS Aggregator</name>
    1212
  • SRUAggregator/trunk/src/main/resources/assets/clarinservices/clarinservices.css

    r6145 r6155  
    22        background-color: transparent;
    33        font-size:18px;
     4}
     5
     6#clarinservices ul {
     7        border-radius: 50px 50px;
     8        border-top-right-radius: 0 0;
     9        padding: 20px;
    410}
    511
     
    814        vertical-align: top;
    915        background-color: #FFFFFF;
    10         border-color: #FFFFFF;
    11         padding: 15px;
    1216        width: 100%;
    1317}
    1418
    15 #clarinservices table td {
    16         width: 33%;
    17         border: 1px solid black;
     19#clarinservices table td li div{
     20        width: 150px;
     21        height: 150px;
    1822        background-color: #fff;
    1923        padding: 20px;
    20         border-color: black;
    21         transition: background-color .4s, border-color .2s;
     24        transition: background-color .2s, border-color .2s;
     25        border-radius: 50% 50%;
     26        border: 2px solid #fff;
    2227}
    2328
    24 #clarinservices table td:hover {
    25         border-color: orange;
    26         border: 1px solid orange;
    27         background-color: #eef;
     29#clarinservices table td:hover li div{
     30        background-color: #FFF8D8;
     31        border: 2px solid #003f6e;
     32        box-shadow: inset 0 0 10px #003f6e;
    2833}
    2934
    30 #clarinservices table td img {
     35#clarinservices table td li div img {
    3136        margin-right: 0px;
    32         max-width: 100px;
    33         max-height: 100px;
     37        max-width: 50px;
     38        max-height: 50px;
    3439}
  • SRUAggregator/trunk/src/main/resources/assets/clarinservices/clarinservices.js

    r6144 r6155  
    8686        var description = escapeHtml(service.description);
    8787
    88         var p_image     =       "<p><a href='" + href + "'><img src='" + image + "'></a></p>";
    89         var p_title     =       "<p><a href='" + href + "'>" + title + "</a></p>";
     88        var p_image     =       "<p><img src='" + image + "'></p>";
     89        var p_title     =       "<p>"+ title + "</p>";
    9090        var p_desc      =       "<p>" + description + "</p>";
    9191
    92         return "<td><li role='presentation'>" + p_image + p_title + /* p_description + */ "</li></td>";
     92        return "<td><li role='presentation'><div><a href='" + href + "'>" +
     93                                p_image + p_title + /* p_description + */
     94                        "</a></div></li></td>";
    9395}
    9496
  • SRUAggregator/trunk/src/main/resources/assets/js/main.js

    r6154 r6155  
    33"use strict";
    44
    5 var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-40";
     5var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-41";
    66
    77var URLROOT = window.MyAggregator.URLROOT =
  • SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

    r6154 r6155  
    33"use strict";
    44
    5 var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-40";
     5var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-41";
    66
    77var URLROOT = window.MyAggregator.URLROOT =
Note: See TracChangeset for help on using the changeset viewer.