From 083c8ddc693b0e2994ce7345ad6b7b7c286e61bc Mon Sep 17 00:00:00 2001 From: orbiter Date: Tue, 2 Aug 2005 00:16:19 +0000 Subject: [PATCH] new alert symbols git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@473 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/Messages_p.java | 2 +- htroot/Network.html | 9 ++++----- htroot/Network.java | 18 ++++++++---------- htroot/env/grafics/broadcast.gif | Bin 0 -> 983 bytes htroot/env/grafics/crawl.gif | Bin 0 -> 1095 bytes .../env/grafics/{notifier.gif => empty.gif} | Bin htroot/env/grafics/message.gif | Bin 0 -> 996 bytes htroot/env/grafics/notifierActive.gif | Bin 836 -> 0 bytes htroot/env/grafics/notifierInactive.gif | Bin 824 -> 0 bytes htroot/env/grafics/profile.gif | Bin 0 -> 940 bytes htroot/env/grafics/wiki.gif | Bin 0 -> 943 bytes htroot/env/templates/header.template | 2 +- htroot/yacy/message.java | 2 +- source/yacy.java | 6 ++++++ 14 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 htroot/env/grafics/broadcast.gif create mode 100644 htroot/env/grafics/crawl.gif rename htroot/env/grafics/{notifier.gif => empty.gif} (100%) create mode 100644 htroot/env/grafics/message.gif delete mode 100644 htroot/env/grafics/notifierActive.gif delete mode 100644 htroot/env/grafics/notifierInactive.gif create mode 100644 htroot/env/grafics/profile.gif create mode 100644 htroot/env/grafics/wiki.gif diff --git a/htroot/Messages_p.java b/htroot/Messages_p.java index a8dc4dbd6..c214d8e4d 100644 --- a/htroot/Messages_p.java +++ b/htroot/Messages_p.java @@ -76,7 +76,7 @@ public class Messages_p { messageBoard.entry message; // first reset notification - File notifierSource = new File(switchboard.getRootPath(), switchboard.getConfig("htRootPath","htroot") + "/env/grafics/notifierInactive.gif"); + File notifierSource = new File(switchboard.getRootPath(), switchboard.getConfig("htRootPath","htroot") + "/env/grafics/empty.gif"); File notifierDest = new File(switchboard.getRootPath(), switchboard.getConfig("htRootPath","htroot") + "/env/grafics/notifier.gif"); try {serverFileUtils.copy(notifierSource, notifierDest);} catch (IOException e) {}; diff --git a/htroot/Network.html b/htroot/Network.html index d44deb4c9..4a32d3edd 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -38,7 +38,7 @@

Showing #[num]# entries from a total of #[total]# peers.
- + #(complete)#:: @@ -61,10 +61,9 @@ #{list}# - #(complete)# diff --git a/htroot/Network.java b/htroot/Network.java index e9912aeb3..03c50296b 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -257,27 +257,25 @@ public class Network { } else { prop.put("table_list_"+conCount+"_dark", ((dark) ? 1 : 0) ); dark=!dark; } - prop.put("table_list_"+conCount+"_updatedProfile", (((updatedProfile.contains(seed.hash))) ? 1 : 0)); + String alert = ""; + if (updatedProfile.contains(seed.hash)) { + alert += ""; + } if ((wikiPage = (String) updatedWiki.get(seed.hash)) == null) { - prop.put("table_list_"+conCount+"_updatedWiki", 0); prop.put("table_list_"+conCount+"_updatedWikiPage", ""); } else { - prop.put("table_list_"+conCount+"_updatedWiki", 1); prop.put("table_list_"+conCount+"_updatedWikiPage", "?page=" + wikiPage); + alert += ""; } try { PPM = Integer.parseInt(seed.get("ISpeed", "-")); } catch (NumberFormatException ee) { PPM = 0; } - if (((startURL = (String) isCrawling.get(seed.hash)) == null) || (PPM < 10)) { - prop.put("table_list_"+conCount+"_isCrawling", 0); - prop.put("table_list_"+conCount+"_isCrawling_startURL", ""); - } else { - prop.put("table_list_"+conCount+"_isCrawling", 1); - prop.put("table_list_"+conCount+"_isCrawling_startURL", startURL); + if (((startURL = (String) isCrawling.get(seed.hash)) != null) && (PPM >= 10)) { + alert += ""; } - + prop.put("table_list_"+conCount+"_alert", alert); long links, words; try { links = Long.parseLong(seed.get("LCount", "0")); diff --git a/htroot/env/grafics/broadcast.gif b/htroot/env/grafics/broadcast.gif new file mode 100644 index 0000000000000000000000000000000000000000..4ca560946239b5bc4f82b3750a3c6d11b04db373 GIT binary patch literal 983 zcmbu8%}dmA5XQ$BXsM{S!a8NGQW74D>BSI2YOA$F667IIg)oubLRq1=H7mCcAzHye zkXb}66sg^WK#b^RIs{&n)`L);TDnybOwauOg}#SfhWUP<`8?0;9%(<^vhVaBT0y^P zr^hjObr*Mbr>M-_)J@#jjiRaMs;=V7t`v90T+~He*oERLo3lELGdmNMoXkm`#EG3y zKpWD~!eiW~m=j0M#Ei`-#-dU+6;n2)pg>d9L`>L(0t$Cojm4Oa35@dp5dgSw z9YMn_qC_6R#B0O>CK!f8P(uvRcnK_UU@){HO|hc5jW%i=!p0CJ{9!CACW-|n>ko=# zqp{CqNdcAQ9_vk_48|m#*mhz#kP{EF`~)i;B$FVGp98jp@ZhOJR3@4xDiIZl@PC^i^Y6C-`Uxj&1N&1OgbIfTmIBm;ftE%BmNVVdPP;e z8*?wmW(HI1wr87u7G{UmG#tI3n^<}?P{%!An$nL3uP)oawl_CCJG*N2p{^Zm=NsRT zHgu2w{XOz+KwCPVWanoNK`6$Ix*5-zjF77 z^=CSsA8TKDeDdM;>WQ|43(dEt7C*hHE8O^TbJzFd&r?R$SuJqF#Uot=BX=kxuZt@%(qy6#-x5>?MM~x9<*cftSQK=dgqimEM1)8Ep#0VQ92Zg(=hQ%-& zCNScuAvGk1*bt_I8e)J3C9u%LU}!@cT6j#(kgIV-l~u|4!&p=zDy%}zE-27sQD$X= zdqCl?k|?nf>>&?e;x*!ce?Y(?s38VuP~s{$Fc{j9h8DTxTpKkGi;xQv{xB95voIl7 z*aZceLM((Fku(AT7p@~{xJ8u61DJS?IKTwMa0qIM0U9rX1r7{`Hl)d|$lXR8H4b58 z2onA<78Mh@1$ygu6y8SNKD{M5C@*)nUN1_==%wSf?HP8+o(H#l56e05CP5lM2W$!9 z!Bc@KPc%c6Axaaah>}DxqA*bfF#e-mC=~Mf{LIWuCX-30)2UP{nM}rFv2ZwCQQ@?= z*pj17C)yhu+M4#%))o2OSIaAXHTY12&*c6l6v$Fp@5Ywt(Yb-Z+8wdL=zRaJ@~y2S zEzic9hKhD|E#`X8y-)jt`va?b#*6Qj*GI2TEWODM1%n5=hmUVdJPKWie`}lT^p{3& zzI}b|;E#9r0}p0zocuCgJQ^vUomyzGijT#E;pycU1B3qRozaPfrM~{sb$uPv-B%`? zr}kDXocg%_Yeyz=DSNtlL+10#HLIWeJ{+k&)_+-fp1u9^a%JM-=1sMWAD%yLAfJ!w F{{UUr)l>ig literal 0 HcmV?d00001 diff --git a/htroot/env/grafics/notifier.gif b/htroot/env/grafics/empty.gif similarity index 100% rename from htroot/env/grafics/notifier.gif rename to htroot/env/grafics/empty.gif diff --git a/htroot/env/grafics/message.gif b/htroot/env/grafics/message.gif new file mode 100644 index 0000000000000000000000000000000000000000..1a5520f056dc624cff6798d972e05498a8187fd4 GIT binary patch literal 996 zcmbu8%WKn75QQfgZ7~W4r4&KM)Zzod$^@wv3bwH?l?sw#yU~ISqFXg!H?2XNjpEXg zidiT^5SrG4O1emW;o|P>#zmm03o8=4sx1iPncu(QT_g;1@0stMNqYNx+K-POqXhk- zqvj`=shOCu8F>|g1+^d+*aCS|gQ=Q|DVvhtm0+SKV!|fmPdON?u^6*4LCGi>sgW45 z5ejHS8d`Xa+vIcnXb2Jlhd@3Sm1`=1 zK$r?@hyfauz(Nm$p$%zh;W4=(uW>|`RmuHfEGiKdRw1_w3N%@iS()G-P`IlkN~{EX z$OD*ojX2;R5O4@;hyfauxC#yohBl<3MV_3uQRA=(d64jjv8b4Z3Aw^9D9{vQA>@dp z5dgSw9YMn_qC_6R#B0O>CK!f8P(uvRcnK_UU@){HO}-+(jW%i=!p0CJ{9!CACh`SF z>vxK1qrT5*Ne&g|?(2=BbjBzh-*#l!ks}Yj{0Pe(M3W$mp98jp@ZhOVR3oYom52&N zIif64hA2gp1jc`~>-BoAR;yGhrBbO-DCBavY&M(8WKyYAGU?iT*W)pK(P97a{{%HI zQ0#hhU%9xDZ`^(;b6{os-Q>2GfvLWkukRFM2V zU((<6(>*5#&i<^v9hzz=-cIkF`7!wL)bP!<^-GtBUtW8DKRq`7Y~*QMes$~o?C>k_kx;(f1c~dMNr;dMQS-Nik literal 0 HcmV?d00001 diff --git a/htroot/env/grafics/notifierActive.gif b/htroot/env/grafics/notifierActive.gif deleted file mode 100644 index 761a15a990c966c0658b4dbec7ac3947f55be9a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 836 zcmZ`&Pe>GD6#uP%n6V+yVHk(9TB$<^iIR}gJ*+ymYf1;ZdeF#qrEyItz6GO#iaNz6 zdW#^6i0~lcQICRz4!gzd%y2(to71`i`^PD zYyrDczIMFK)jeCmEd=tRYgGUSDtyQE?^qDp(>hrbTw3B^TDWY#a!skFZXXJ!|5;lC{JLzva9H>xm zSb7=v{<;lkJBEcsBGr@fl3x%cU$rWem{~HBypn`n-+8Ssg&Vhfdz>@9eF;3Z_HsrG zKzLopnEO$1KRR7zUjrgChwZ?B`m>3fbEYhm@5qYX$T@L`?j#2-%7=^%N3-I6H(f(QM-QyNn?_m7ThK}%13noajjJNeqs>Q(AY?D0mhuP%W znJczErsRA39CYq;Kyj8u!ua1@<=?$pJoCZ1K)mp-{B$hjXfD=gskhS1rYL;ckh^e1 z3Ekr?m6|z4I!w*&zcfcY;kV?-dFnen*R(l8bs1;b$6-F_-*~&JQr;@ryi>tmr3s(s zLR{!$0tA^tAkI)cRs}WMG;+f@F4;1Z?{dT;&@nPAq T%g^H#D<>bBM{BFBay0w}lb_SQ diff --git a/htroot/env/grafics/notifierInactive.gif b/htroot/env/grafics/notifierInactive.gif deleted file mode 100644 index 330c7e881e24f150e542d2e7ab11996afad442d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 824 zcmZ`&O-NKx6#iy1=EV@y>opD%H9-pziG+yMSxh!IO47o%voOhVq~}zS+<~Hk7Pblv z+eSjP2p2=Rv_(WPkekUr+=K}B27_U;v>yvQ-+k{XNFA7W&OPVc@0|19GpWuCXPd8t z5yp35OUvi(@$#9`W!!=cOZvrL;ZdB$^L;19!0lv zo>YO@nu!VLgJM6XT&AxTah*fk_t!5(aAPK-3st&HYAfEP?#P|&&8Xx<#~vq2>Q(JG z;Sng$N01P0$dCObq|UTgrz;fxXRVjR?YiFX`0sTSvD@vK6iq2y9Go)t029+~`pgg6 z*$2RbKEp zFJ~bV`L+e4Mzp`5)s|1{c`2#6J^s_(u11N=KO&5TaTo#PNJrt>n+L|BhIFwo{&pC_ HAX@(dwRF)# diff --git a/htroot/env/grafics/profile.gif b/htroot/env/grafics/profile.gif new file mode 100644 index 0000000000000000000000000000000000000000..c1a90d0fa38dfb57e4ff6e651e81bb79895db91b GIT binary patch literal 940 zcmbu8v1`+D5XE1hYN1k^3e|$enmSaGLb)on9ZE51TNjrM9UZ(uaTBsQSQU(0QB=+r z5vrgWL=o(erO}RugNuk}5ydT(F5+~)`~3@khlJz4-*=z)E;+w=Zu-on)9AyWeUp*L zBP>EABm!Bvhg-OYOE|J=9%f-0CSl0C>Y)~@p%RLGDjs4X8X_T}QosWi(0~M3P@B@! z;$z-M&dFo$>Mricv8>G8)J@!w6l|)ws;jsnp?Fu!MP0-NWaLwaIn*HzP9-(P2u(_2 zvB$yGrZlzq7-=YL9yJp)q(6>jrD`gsNV}w9Q`AIEK=*{=U4t6LKzq!Cn0(DR=${aD zNNS1^nv}ds4i2U^rKyEXF59emL=_n%{c$WS5fw03+9d^>3Q;geCd~lI#p?{3ZW$%> zASPck4l>a&9g>=2gyu_Pk%NP&O=;wc@;2M7dBBY^Nc!VgRs!S#i}fc(vC-UTv8045 za?kY^Q6^)NPHwv}oXCZTTz-L-4vI;X=Ffp!VtDk_1v)?rXaWtO4%C1uPyx!s_>XqC z+wF8ZtyZhqY&IH=dc9t&)vDEMrBW%EQ~T)Oo)W)sGC%S^f!=#4T|cz&=2`o8?|~E5 z@tvC=?+%PDtuMU&vAr@RSH6#zH|G2M=VpG6?rybL$H$&deQh7xel&69!=2;uVrlKv z?EB}#4}SaF>C+4Ji5I4 c>Wl4N9=fr0f8*Qc!95e}7dBtdqg2A|KVn;+R{#J2 literal 0 HcmV?d00001 diff --git a/htroot/env/grafics/wiki.gif b/htroot/env/grafics/wiki.gif new file mode 100644 index 0000000000000000000000000000000000000000..dd1f1add41ad1d00aaa78c315d41af443295b273 GIT binary patch literal 943 zcmbu8yKB@@5QR^S;zCGFA_fZ^S0QWELIxxn?N*IqND)>rAV!5L1R?lfEfXzVFk-M9 zP%-#G77Js$jV}bl)Y`Zp+R73{@Kuawe*c2E*kzb|&wS_1?vbO1NB5oCiyr*Mp2*`7 z7NHRmfvnuaEnLGT9N9DvvoH;lFyvkJPz%*i2}M2?53vvpkq}TR-~kJ0KmshNO=)WJ zF>fR1UyHq~6!Ra}u!yesCSF5&_*@~Oid>JSH~lA2 - + diff --git a/htroot/yacy/message.java b/htroot/yacy/message.java index 74a700b6e..4fe3522ff 100644 --- a/htroot/yacy/message.java +++ b/htroot/yacy/message.java @@ -134,7 +134,7 @@ public class message { messageForwardingViaEmail(env,msgEntry); // finally write notification - File notifierSource = new File(switchboard.getRootPath(), switchboard.getConfig("htRootPath","htroot") + "/env/grafics/notifierActive.gif"); + File notifierSource = new File(switchboard.getRootPath(), switchboard.getConfig("htRootPath","htroot") + "/env/grafics/message.gif"); File notifierDest = new File(switchboard.getRootPath(), switchboard.getConfig("htRootPath","htroot") + "/env/grafics/notifier.gif"); try { serverFileUtils.copy(notifierSource, notifierDest); diff --git a/source/yacy.java b/source/yacy.java index 16f7d9ddd..635b76256 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -222,6 +222,12 @@ public final class yacy { File htDocsPath = new File(sb.getRootPath(), sb.getConfig("htDocsPath", "DATA/HTDOCS")); File htTemplatePath = new File(sb.getRootPath(), sb.getConfig("htTemplatePath","htdocs")); + // create default notifier picture + if (!((new File(htRootPath, "env/pictures/notifier.gif")).exists())) try { + serverFileUtils.copy(new File(htRootPath, "env/pictures/empty.gif"), + new File(htRootPath, "env/pictures/notifier.gif")); + } catch (IOException e) {} + if (!(htDocsPath.exists())) htDocsPath.mkdir(); File htdocsDefaultReadme = new File(htDocsPath, "readme.txt"); if (!(htdocsDefaultReadme.exists())) try {serverFileUtils.write((
send Message/
show Profile/
edit Wiki
(* = updated)		send Message/
show Profile/
edit Wiki
 		 Name
 		Address
 		#Connects
per hour
 
m    - p#(updatedProfile)# ::*#(/updatedProfile)#   - w#(updatedWiki)# ::*#(/updatedWiki)#   - #(isCrawling)#::crawl#(/isCrawling)# +m   + p   + w  #[alert]# #[shortname]# Home Page
 File Share
 Wiki
  Messages 
  Messages 
  Personal Profile