# HG changeset patch # User Zoe Hong # Date 1448016809 -3600 # Node ID eab47936591ac17bb9317edbeef8cb9ba5f3165d # Parent 89a5ca7d44f71663b9b0e95c3717c0a7bef90c4f apply scrollbar to other tables as well diff -r 89a5ca7d44f7 -r eab47936591a src/main/resources/config.properties --- a/src/main/resources/config.properties Thu Nov 19 17:14:06 2015 +0100 +++ b/src/main/resources/config.properties Fri Nov 20 11:53:29 2015 +0100 @@ -2,15 +2,15 @@ files_root=/gazetteer-server/data #Local -#db_gazetter_username=root -#db_gazetter_password=root -#dvn_server=http://localhost:8082 -#dvn_apitoken=9dd1f749-8c42-49ab-a2ba-fbb963c2ff90 -#dv_id=2 -#root_server=http://localhost:8080/LGServices -#toc_interface=http://localhost:1080/localgazetteers-dev/LGToc -#extraction_interface=http://localhost:1080/localgazetteers-dev/extraction-interface -#localgazetteers_dvId=185 +db_gazetter_username=root +db_gazetter_password=root +dvn_server=http://localhost:8082 +dvn_apitoken=9dd1f749-8c42-49ab-a2ba-fbb963c2ff90 +dv_id=2 +root_server=http://localhost:8080/LGServices +toc_interface=http://localhost:1080/localgazetteers-dev/LGToc +extraction_interface=http://localhost:1080/localgazetteers-dev/extraction-interface +localgazetteers_dvId=185 # Production one: #localgazetteers-dev -> localgazetteers @@ -25,12 +25,12 @@ # Development one: #localgazetteers -> localgazetteers-test -db_gazetter_username=root -db_gazetter_password=admin -dvn_server=http://dvn.localgazetteers-test.mpiwg-berlin.mpg.de -dvn_apitoken=6acf9525-faba-4ea6-bfff-f83b44386c62 -dv_id=1 -root_server=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGServices -toc_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGToc -extraction_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/extraction-interface -localgazetteers_dvId=2 +#db_gazetter_username=root +#db_gazetter_password=admin +#dvn_server=http://dvn.localgazetteers-test.mpiwg-berlin.mpg.de +#dvn_apitoken=6acf9525-faba-4ea6-bfff-f83b44386c62 +#dv_id=1 +#root_server=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGServices +#toc_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGToc +#extraction_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/extraction-interface +#localgazetteers_dvId=2 diff -r 89a5ca7d44f7 -r eab47936591a src/main/webapp/componentes/headContent.jsp --- a/src/main/webapp/componentes/headContent.jsp Thu Nov 19 17:14:06 2015 +0100 +++ b/src/main/webapp/componentes/headContent.jsp Fri Nov 20 11:53:29 2015 +0100 @@ -1,6 +1,13 @@ LGServices + + + + + + @@ -9,16 +16,12 @@ src="<%=sessionBean.getApplicationBean().getRootServer()%>/resources/js/proxyMethods.js"> - + + - + - - - - \ No newline at end of file diff -r 89a5ca7d44f7 -r eab47936591a src/main/webapp/componentes/template.jsp --- a/src/main/webapp/componentes/template.jsp Thu Nov 19 17:14:06 2015 +0100 +++ b/src/main/webapp/componentes/template.jsp Fri Nov 20 11:53:29 2015 +0100 @@ -6,6 +6,7 @@ $(function() { $( "#msgDialog" ).dialog(); }); +
diff -r 89a5ca7d44f7 -r eab47936591a src/main/webapp/pages/books.jsp --- a/src/main/webapp/pages/books.jsp Thu Nov 19 17:14:06 2015 +0100 +++ b/src/main/webapp/pages/books.jsp Fri Nov 20 11:53:29 2015 +0100 @@ -57,11 +57,12 @@

<%= (StringUtils.isNotEmpty(sessionBean.getBooksPage().getFilteringMessage())) ? sessionBean.getBooksPage().getFilteringMessage() : ""%>

- - - + + + - +
+
@@ -474,7 +475,7 @@ - + <% } %> diff -r 89a5ca7d44f7 -r eab47936591a src/main/webapp/pages/home.jsp --- a/src/main/webapp/pages/home.jsp Thu Nov 19 17:14:06 2015 +0100 +++ b/src/main/webapp/pages/home.jsp Fri Nov 20 11:53:29 2015 +0100 @@ -9,25 +9,13 @@ - - - - -
<% if(sessionBean.getUser() == null) { %> diff -r 89a5ca7d44f7 -r eab47936591a src/main/webapp/pages/search.jsp --- a/src/main/webapp/pages/search.jsp Thu Nov 19 17:14:06 2015 +0100 +++ b/src/main/webapp/pages/search.jsp Fri Nov 20 11:53:29 2015 +0100 @@ -11,8 +11,8 @@ + -