# HG changeset patch # User František Kučera # Date 1267694428 -3600 # Node ID 9b2a597cc8621f3b92bbd7e8fabd03fd740fc0e0 # Parent 86bd44cebe8f5e84a1f9bf169fc44e4506797acc Atom syndikace, slovenština, ověřování uživatelů proti DB. diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java --- a/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java Thu Mar 04 10:20:28 2010 +0100 @@ -2,6 +2,7 @@ import cz.frantovo.nekurak.dto.Podnik; import java.util.Collection; +import java.util.Date; import javax.ejb.LocalBean; import javax.ejb.Stateless; import javax.persistence.EntityManager; @@ -26,6 +27,10 @@ } public void uloz(Podnik p) { + if (p.getDatum() == null) { + p.setDatum(new Date()); + } + em.persist(p); } diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties Thu Mar 04 10:20:28 2010 +0100 @@ -12,6 +12,8 @@ prepinaniJazyku.cestina=\u010De\u0161tina prepinaniJazyku.cestina.tip=str\u00E1nka ji\u017E je v \u010De\u0161tin\u011B +prepinaniJazyku.slovenstina=sloven\u0161tina +prepinaniJazyku.slovenstina.tip=p\u0159epnout na sloven\u0161tinu prepinaniJazyku.anglictina=angli\u010Dtina prepinaniJazyku.anglictina.tip=p\u0159epnout na angli\u010Dtinu diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties Thu Mar 04 10:20:28 2010 +0100 @@ -12,6 +12,8 @@ prepinaniJazyku.cestina=Czech prepinaniJazyku.cestina.tip=switch to Czech +prepinaniJazyku.slovenstina=Slovak +prepinaniJazyku.slovenstina.tip=switch to Slovak prepinaniJazyku.anglictina=English prepinaniJazyku.anglictina.tip=page is already in English diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_sk.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_sk.properties Thu Mar 04 10:20:28 2010 +0100 @@ -0,0 +1,50 @@ +jazyk=sloven\u0161tina + +nazev=Neku\u0159\u00E1k.net +popis=Datab\u00E1ze neku\u0159\u00E1ck\u00FDch restaurac\u00ED. +licence=\u00A9 2010 nekurak.net. Licence: Affero GPL. + +uvod=\u00DAvod +prihlasitSe=P\u0159ihl\u00E1sit sa +odhlasitSe=Odhl\u00E1sit sa +pridatPodnik=P\u0159idat podnik +prihlasenyUzivatel=P\u0159ihl\u00E1\u0161en\u00FD u\u017Eivatel + +prepinaniJazyku.cestina=\u010De\u0161tina +prepinaniJazyku.cestina.tip=p\u0159epnout na \u010De\u0161tinu +prepinaniJazyku.slovenstina=sloven\u0161tina +prepinaniJazyku.slovenstina.tip=str\u00E1nka ji\u017E je ve sloven\u0161tin\u011B +prepinaniJazyku.anglictina=angli\u010Dtina +prepinaniJazyku.anglictina.tip=p\u0159epnout na angli\u010Dtinu + +chybovaStranka.404.nazev=404 Str\u00E1nka nenalezena +chybovaStranka.404.popis=Takovou str\u00E1nku tu bohu\u017Eel nem\u00E1me. +chybovaStranka.500.nazev=500 Intern\u00ED chyba serveru +chybovaStranka.500.popis=N\u011Bco se bohu\u017Eel nepovedlo. + +uvod.naposledyPridanePodniky=Naposledy p\u0159idan\u00E9 podniky +uvod.www=www str\u00E1nka +uvod.adresa=Adresa + + +prihlaseni.odhlaseniUspesne=Odhl\u00E1\u0161en\u00ED prob\u011Bhlo \u00FAsp\u011B\u0161n\u011B. +prihlaseni.nadpis=P\u0159ihl\u00E1\u0161en\u00ED +prihlaseni.zadejte=Zadejte jm\u00E9no a heslo. +prihlaseni.chyba=Nespr\u00E1vn\u00E9 jm\u00E9no nebo heslo, zkuste to pros\u00EDm znovu. +prihlaseni.jmeno=Jm\u00E9no +prihlaseni.heslo=Heslo +prihlaseni.tlacitko=P\u0159ihl\u00E1sit se + +pridatPodnik.nadpis=P\u0159id\u00E1n\u00ED nov\u00E9ho podniku +pridatPodnik.bylPridan=Podnik byl \u00FAsp\u011B\u0161n\u011B p\u0159id\u00E1n. +pridatPodnik.tlacitko=P\u0159idat podnik + +dto.podnik.nazev=N\u00E1zev +dto.podnik.popis=Popis +dto.podnik.url=URL +dto.podnik.url.tip=www str\u00E1nka +dto.podnik.datum=Datum +dto.podnik.ulice=Ulice +dto.podnik.cisloPopisne=\u010D.p. +dto.podnik.cisloPopisne.tip=\u010D\u00EDslo popisn\u00E9 +dto.podnik.mesto=M\u011Bsto diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/Atom.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/Atom.java Thu Mar 04 10:20:28 2010 +0100 @@ -0,0 +1,29 @@ +package cz.frantovo.nekurak.web; + +import cz.frantovo.nekurak.dto.Podnik; +import java.util.Collection; +import java.util.Date; + +/** + * + * @author fiki + */ +public class Atom { + + private HledacSluzby hledac = new HledacSluzby(); + private Collection podniky; + + public Collection getPodniky() { + if (podniky == null) { + podniky = hledac.getPodnikEJB().getPodniky(); + } + return podniky; + } + + public Date getDatumAktualizace() { + for (Podnik p : getPodniky()) { + return p.getDatum(); + } + return new Date(); + } +} diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/HledacSluzby.java --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/HledacSluzby.java Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/HledacSluzby.java Thu Mar 04 10:20:28 2010 +0100 @@ -1,6 +1,5 @@ package cz.frantovo.nekurak.web; -import cz.frantovo.nekurak.ejb.PodnikDAORemote; import cz.frantovo.nekurak.ejb.PodnikRemote; import java.io.Serializable; import java.util.logging.Level; diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/web/WEB-INF/atom/atom.jsp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-web/web/WEB-INF/atom/atom.jsp Thu Mar 04 10:20:28 2010 +0100 @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + <fmt:message key="nazev"/> + + + + + + + + František Kučera + franta_nechci_spam@frantovo.cz + + urn:uuid:0663f9ab-e289-47b3-893f-5bafcf8dc110 + + + + + <c:out value="${podnik.nazev}"/> + + urn:NekurakNET:podnik:${podnik.id} + + + + + + + + + + + diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/web/WEB-INF/casti/prepinaniJazyku.jsp --- a/java/nekurak.net-web/web/WEB-INF/casti/prepinaniJazyku.jsp Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-web/web/WEB-INF/casti/prepinaniJazyku.jsp Thu Mar 04 10:20:28 2010 +0100 @@ -6,9 +6,12 @@
+ + ${prepinaniJazykuCestina} + ${prepinaniJazykuSlovenstina} ${prepinaniJazykuAnglictina}
diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/web/WEB-INF/sun-web.xml --- a/java/nekurak.net-web/web/WEB-INF/sun-web.xml Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-web/web/WEB-INF/sun-web.xml Thu Mar 04 10:20:28 2010 +0100 @@ -11,6 +11,6 @@ opravneny - spravce + bezny diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/web/WEB-INF/web.xml --- a/java/nekurak.net-web/web/WEB-INF/web.xml Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-web/web/WEB-INF/web.xml Thu Mar 04 10:20:28 2010 +0100 @@ -1,46 +1,56 @@ - 30 + 30 - index.jsp + index.jsp - - 404 - /WEB-INF/chyby/404.jsp + + 404 + /WEB-INF/chyby/404.jsp - - 500 - /WEB-INF/chyby/500.jsp + + 500 + /WEB-INF/chyby/500.jsp - + + + atom + /WEB-INF/atom/atom.jsp + + + + atom + /atom/* + + - - javax.servlet.jsp.jstl.fmt.fallbackLocale - cs + + javax.servlet.jsp.jstl.fmt.fallbackLocale + cs - opravneny + opravneny - - Správa Nekuřák.net - /sprava/* - - - opravneny - - + + Správa Nekuřák.net + /sprava/* + + + opravneny + + - FORM - nekurakNET + FORM + nekurakNET /?akce=prihlaseni /?akce=prihlaseni&chyba=ano diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/web/grafika/jazyk_sk.png Binary file java/nekurak.net-web/web/grafika/jazyk_sk.png has changed diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/web/index.jsp --- a/java/nekurak.net-web/web/index.jsp Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-web/web/index.jsp Thu Mar 04 10:20:28 2010 +0100 @@ -35,6 +35,7 @@ <fmt:message key="nazev"/> +
diff -r 86bd44cebe8f -r 9b2a597cc862 java/nekurak.net-web/web/styl.css --- a/java/nekurak.net-web/web/styl.css Fri Feb 26 23:45:43 2010 +0100 +++ b/java/nekurak.net-web/web/styl.css Thu Mar 04 10:20:28 2010 +0100 @@ -58,9 +58,9 @@ #prepinaniJazyku { position: relative; - left: 940px; + left: 910px; top: -29px; - width: 60px; + width: 90px; margin: 0px; padding: 0px; } @@ -111,6 +111,10 @@ color: black; } +.podnik { + border-top: 1px dashed silver; +} + fieldset { border: none; }