diff --git a/example.deploy.properties b/example.deploy.properties index d65a8557..dff5f5cf 100644 --- a/example.deploy.properties +++ b/example.deploy.properties @@ -63,7 +63,7 @@ email.replyTo = vivoAdmin@my.domain.edu # # The basic parameters for a database connection. Change the end of the -# URL to reflect your database name (if it is not "vitro"). Change the username +# URL to reflect your database name (if it is not "vitrodb"). Change the username # and password to match the authorized database user you created. # VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css index 21d8b6cf..caeb08c4 100644 --- a/productMods/css/visualization/entitycomparison/layout.css +++ b/productMods/css/visualization/entitycomparison/layout.css @@ -15,8 +15,14 @@ #subject-parent-entity { display: none; + font-size:.7em; + color:#aaa; + margin-left:10px; +} +#subject-parent-entity-spacer { + color:#aaa; + margin-left:-18px; } - #error-container { display: none; } diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl index 2da6f0e9..28f58f48 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl @@ -2,13 +2,13 @@
-
-   - -
+ -

${organizationLabel}  - information icon

+

${organizationLabel} + |   +   + +


@@ -94,7 +94,8 @@
-

+

  + information icon

You have selected 0 of a maximum 10 schools. diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index c9a04e6a..dfaf98fc 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1497,7 +1497,7 @@ table#account td { padding: .5em; border: 1px solid #F7F9F9; font-size: .9em; -} +} table#account tr { background-color: #fff; } @@ -1550,7 +1550,7 @@ form.customForm #reset-password { #add-account .note { padding-bottom: 20px; padding-top: 0; - margin-top: 5px; + margin-top: 25px; } /* -------------------------------------------------> */ /* DROP DOWN USER MENU ----------------------------> */ @@ -1612,7 +1612,6 @@ ul.dropdown ul.sub_menu li { } ul.dropdown ul.sub_menu li:last-child { width: 96px; - } /* IE 6 & 7 Needs Inline Block */ /* ADD IN IE6.css and IE7.css*/