From fb8fe391b14ff37608afb18412329e208ee94c85 Mon Sep 17 00:00:00 2001 From: Arif Syamsudin Date: Thu, 19 Apr 2012 23:26:16 +0700 Subject: [PATCH 01/12] Deleted: sysconfig.local.inc-sample.php --- sysconfig.local.inc-sample.php | 45 ---------------------------------- 1 file changed, 45 deletions(-) delete mode 100755 sysconfig.local.inc-sample.php diff --git a/sysconfig.local.inc-sample.php b/sysconfig.local.inc-sample.php deleted file mode 100755 index 3a2b57d..0000000 --- a/sysconfig.local.inc-sample.php +++ /dev/null @@ -1,45 +0,0 @@ - 'senayan.slims@slims.web.id', 'from_name' => 'Librarian 2'); -$sysconf['mail']['add_recipients'][] = array('from' => 'wynerst@gmail.com', 'from_name' => 'Librarian 3'); -*/ -?> From 9436740e42335bd86e6d7e1fa93ca7824bcd6d71 Mon Sep 17 00:00:00 2001 From: Arif Syamsudin Date: Thu, 19 Apr 2012 23:29:15 +0700 Subject: [PATCH 02/12] Added: New sysconfig.local file --- sysconfig.local.inc-sample.php | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 sysconfig.local.inc-sample.php diff --git a/sysconfig.local.inc-sample.php b/sysconfig.local.inc-sample.php new file mode 100755 index 0000000..3a2b57d --- /dev/null +++ b/sysconfig.local.inc-sample.php @@ -0,0 +1,45 @@ + 'senayan.slims@slims.web.id', 'from_name' => 'Librarian 2'); +$sysconf['mail']['add_recipients'][] = array('from' => 'wynerst@gmail.com', 'from_name' => 'Librarian 3'); +*/ +?> From 2c3872bcd756c177290593e4fa5c26c5547ff4e2 Mon Sep 17 00:00:00 2001 From: Eddy Subratha Date: Fri, 20 Apr 2012 09:49:05 +0700 Subject: [PATCH 03/12] Fixed : Replace eregi to preg_match (not supported in PHP 5) Fixed : Auto CHMOD for root access --- install/index.php | 3 ++- install/install.php | 2 +- install/install2.php | 15 +++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/install/index.php b/install/index.php index 0a8e95e..d046550 100755 --- a/install/index.php +++ b/install/index.php @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + include "settings.php"; if (file_exists($config_file_path)) { header("location: ".$application_start_file); @@ -44,7 +45,7 @@ - Slims Installer + Start | Slims Installer diff --git a/install/install.php b/install/install.php index e31eb1b..5421ce1 100755 --- a/install/install.php +++ b/install/install.php @@ -27,7 +27,7 @@ - Step 2 | Slims's Easy Installer Guide + Step 1 | Slims Installer diff --git a/install/install2.php b/install/install2.php index 82d71c0..87712e2 100755 --- a/install/install2.php +++ b/install/install2.php @@ -2,7 +2,7 @@ /** * Slims Installer files * - * Copyright � 2006 - 2012 Advanced Power of PHP + * Copyright © 2006 - 2012 Advanced Power of PHP * Some modifications & patches by Eddy Subratha (eddy.subratha@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -57,9 +57,10 @@ $config_file = str_replace("_DB_USER_", $database_username, $config_file); $config_file = str_replace("_DB_PASSWORD_", $database_password, $config_file); - $f = @fopen($config_file_path, "w+"); + @chmod($config_file_directory,0777); + $f = @fopen($config_file_path, "wb"); if (@fwrite($f, $config_file) > 0){ - $link = @mysql_connect($database_host, $database_username, $database_password); + $link = @mysql_connect($database_host, $database_username, $database_password); if($link){ if (@mysql_select_db($database_name)) { if(false == ($db_error = apphp_db_install($database_name, $sql_dump))){ @@ -88,7 +89,9 @@ } else { $error_mg[] = "
  • Can not open configuration file ".$config_file_directory.$config_file_name."
    • "; } - @fclose($f); + fclose($f); + @chmod($config_file_directory,0755); + } } @@ -97,7 +100,7 @@ - Start | Slims's Easy Installer Guide + Step 2 | Slims Installer @@ -206,7 +209,7 @@ function apphp_db_install($database, $sql_file) { if ($next == '') { // get the last insert query $next = 'insert'; } - if ( (eregi('create', $next)) || (eregi('insert', $next)) || (eregi('drop t', $next)) ) { + if ( (preg_match('/create/i', $next)) || (preg_match('/insert/i', $next)) || (preg_match('/drop/i', $next)) ) { $next = ''; $sql_array[] = substr($restore_query, 0, $i); $restore_query = ltrim(substr($restore_query, $i+1)); From 0f4042e08c73f14a8147d500015efef7e87006e7 Mon Sep 17 00:00:00 2001 From: Eddy Subratha Date: Fri, 20 Apr 2012 09:59:45 +0700 Subject: [PATCH 04/12] Fixed : fread change to w+ --- install/install2.php | 4 +--- install/styles.css | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/install/install2.php b/install/install2.php index 87712e2..21d1e7a 100755 --- a/install/install2.php +++ b/install/install2.php @@ -58,7 +58,7 @@ $config_file = str_replace("_DB_PASSWORD_", $database_password, $config_file); @chmod($config_file_directory,0777); - $f = @fopen($config_file_path, "wb"); + $f = @fopen($config_file_path, "w+"); if (@fwrite($f, $config_file) > 0){ $link = @mysql_connect($database_host, $database_username, $database_password); if($link){ @@ -237,5 +237,3 @@ function apphp_db_query($query) { $res=mysql_query($query, $link); return $res; } - -?> \ No newline at end of file diff --git a/install/styles.css b/install/styles.css index a40a75a..ca6b266 100755 --- a/install/styles.css +++ b/install/styles.css @@ -68,7 +68,7 @@ h4 /*----------------------------------------------------------------*/ .wrapper { - width:640px; + width:660px; margin-left: auto; margin-right: auto; border: solid 1px #efefef; From c273245f00db4fd0ff384125b96eda64fdf8a3d7 Mon Sep 17 00:00:00 2001 From: Eddy Subratha Date: Sat, 21 Apr 2012 00:02:12 +0700 Subject: [PATCH 05/12] Fixed : Auto copy of sysconfig.local.inc-sample.php file and rename it as sysconfig.local.inc.php --- install/install2.php | 82 +++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/install/install2.php b/install/install2.php index 21d1e7a..4294d2c 100755 --- a/install/install2.php +++ b/install/install2.php @@ -57,41 +57,45 @@ $config_file = str_replace("_DB_USER_", $database_username, $config_file); $config_file = str_replace("_DB_PASSWORD_", $database_password, $config_file); - @chmod($config_file_directory,0777); - $f = @fopen($config_file_path, "w+"); - if (@fwrite($f, $config_file) > 0){ - $link = @mysql_connect($database_host, $database_username, $database_password); - if($link){ - if (@mysql_select_db($database_name)) { - if(false == ($db_error = apphp_db_install($database_name, $sql_dump))){ - $error_mg[] = "
  • Could not read file ".$sql_dump."! Please check if the file exists
    • "; - @unlink($config_file_path); - }else{ - if($_POST['install_sample'] == 'yes') - { - if(false == ($db_error = apphp_db_install($database_name, $sql_sample))){ - $error_mg[] = "
  • Could not read file ".$sql_sample."! Please check if the file exists
    • "; - }else{ - $completed = true; - } - } else { - $completed = true; + if(!copy('../sysconfig.local.inc-sample.php',$config_file_path)) + { + $error_mg[] = "
  • Could not create file ".$config_file_name."! Please check if the sysconfig.local.inc-sample.php file is exists
    • "; + } else { + @chmod($config_file_path,0777); + $f = @fopen($config_file_path, "w+"); + if (@fwrite($f, $config_file) > 0){ + $link = @mysql_connect($database_host, $database_username, $database_password); + if($link){ + if (@mysql_select_db($database_name)) { + if(false == ($db_error = apphp_db_install($database_name, $sql_dump))){ + $error_mg[] = "
  • Could not read file ".$sql_dump."! Please check if the file exists
    • "; + @unlink($config_file_path); + }else{ + if($_POST['install_sample'] == 'yes') + { + if(false == ($db_error = apphp_db_install($database_name, $sql_sample))){ + $error_mg[] = "
  • Could not read file ".$sql_sample."! Please check if the file exists
    • "; + }else{ + $completed = true; + } + } else { + $completed = true; + } } + } else { + $error_mg[] = "
  • Database connecting error! Check your database exists.
    • "; + @unlink($config_file_path); } - } else { - $error_mg[] = "
  • Database connecting error! Check your database exists.
    • "; - @unlink($config_file_path); - } - } else { - $error_mg[] = "
  • Database connecting error! Check your connection parameters
    • "; - @unlink($config_file_path); - } - } else { - $error_mg[] = "
  • Can not open configuration file ".$config_file_directory.$config_file_name."
    • "; + } else { + $error_mg[] = "
  • Database connecting error! Check your connection parameters
    • "; + @unlink($config_file_path); + } + } else { + $error_mg[] = "
  • Can not open configuration file ".$config_file_directory.$config_file_name."
    • "; + } + @fclose($f); + @chmod($config_file_path,0755); } - fclose($f); - @chmod($config_file_directory,0755); - } } @@ -144,17 +148,9 @@ - - - - - - - - Date: Sat, 21 Apr 2012 08:26:01 +0700 Subject: [PATCH 06/12] Fixed : Loading AJAX for Slims Mobile Template --- template/lightweight/index_template.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/template/lightweight/index_template.inc.php b/template/lightweight/index_template.inc.php index bb156ff..21f18af 100755 --- a/template/lightweight/index_template.inc.php +++ b/template/lightweight/index_template.inc.php @@ -92,6 +92,7 @@ +
    From 89237ad6143b80601e25c0e0bc1efd5c3a568123 Mon Sep 17 00:00:00 2001 From: Arif Syamsudin Date: Sat, 21 Apr 2012 16:23:42 +0700 Subject: [PATCH 07/12] Modified: Bahasa Indonesia translation --- lib/lang/locale/id_ID/LC_MESSAGES/messages.mo | Bin 80161 -> 80205 bytes lib/lang/locale/id_ID/LC_MESSAGES/messages.po | 108 ++++++++++-------- 2 files changed, 60 insertions(+), 48 deletions(-) diff --git a/lib/lang/locale/id_ID/LC_MESSAGES/messages.mo b/lib/lang/locale/id_ID/LC_MESSAGES/messages.mo index eb68747b1299765f4b3a575203d3a30e9851e2e4..d89d7f63dff578870046b8ca5b72194afd3f0fee 100755 GIT binary patch delta 21490 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 bA9eIJ=-a2rhn)v>?L44k&kc8Olx_NdxBiSy delta 21481 zcmYk^2YgT0|HttgNf0DPLJ*NJVz0ysF=B*Rv1e_y_ijql%)n)r|2& ztG1S+YStdV*ZX^p$D{Z6IG$(SbIT(pL->f-)x8Lg|Fk}z)KO1 z)6m~>7R9O7ajrFSoYZ(7L+~!<#rK#E^EP#ySd7CmI1B@DlXWL%p?uJK$<{wXp65Dm zZAJEG=Eg{CF>6_CRcl>qGYs}|oc0*c0|qsBoW8gNJ7K{Vj`Igj!{s=zrQ__ztRFef zL_Cj&dA`%WmE*8@r$B4RNsmP^2rFPptb<|L$kzA4Oq54pFiuC^zudO3!Zeh(VIc0a z^`|g5<*TSjrfB0hp*-ISC8GxyN8J#I88H#lVmn*k6ZOEMwmj9k5HnE!9crRKq9%CW z*55%b=oRYzfVSp&;ppmtMak%a8ODg+44rz19qVve9X3A zL5=$uQ=wlw(=Q!r!C~!)zcPiX2*>iM(6vNOtdn&B>JW~y?GuqR>deBdxBxZ5EvT*7 zgW9?SSO||{B0j?yjBn4P@U!-=<3x~oKt(=G-@$RBunZQ!uISxk^zJcg;8m!VZNNC( zi&fF5qvLom9?M~8RK%8A*I2iq7P#Lflby_IR3!dJ?cp11){o6wQ3};w2^H#ksF1cn z4b&MGp@FDKe1>`rC!)qrLO)!O+R`nk=eP%K#WmE59-#*C8eYum%;W9q7RmsI%}7hN4er$El9lP~)^iBJMh?$oNu`jN1FNsKa-~);~c$5zcel zp4i3geG61*+hR%Vf!eYqm=X`8R(cW(;#E`x1G<_CXTuPl@8l<=P*p&!s0M1_rl^Q? zu;qca-9@c*8Y)s>qxUSJ4&z?bm+>MN$ET<>71_-^r>V6ahVXo+I~j#~B<8>csF`k4 z2Rw{<@DgfbPIt$t3+Yg&yCtT^ai|DRMZHb)Q1|_S-U*?`dy0xoKo8=dicEGgGB;{v zg-|Q2gxcFWsEM^iorNK&y`7C3a20A|yHTM(f_lIy)VSAe{T)>Qhp2J=dlG+zF1V*T zrFl^|Rz^LbA!_EGQ2jlIVxkP!p)xi})+k zj0zpXPN-0JLx1dV>p#KFl!v4G&p@qYDW=8mQ4`vOy8kq4LbLGwzHUa4_n|k*F1ZiCW1VEQ||Lui0T#B(9<+@C?=e9qMrV_puQ| zjq8SyQO8KEg+)*U4Z(sq4dZb;7Q(lv{ssD)0i#e4h(n#78mNVQg!!?HElTD!g*P&K)7#Y|(h1$~JQTJU% zP4E_`$5-g5_diX4Q;{AcX^22gBp&q|^+e5lB4)r17=(MQ$rwoa3hK=Kjg{~*>aa!+ zFe@I2nphG>;Svne`=4wZu3$RKcQ6w^!`v7!(5$!!s=g9xpoXZGwMISoW2}nZu>!8e z0K9|2_ypCSYLNL9*G5+#i0NcB(D$fAwG$P(J*WvBK!x@;dhj9Y0T~CIpMLdFk(!3; zx7NB9HSSNSEj)-B@rErw9ZdW+^Nd5xib7F0Yq$C%!?= zFpMqImgL7!EQ|U8H9)nuuMj;?K=YTM_dCa@Y4@B!x4`yVsPyzgyL4;qIW zU^Z$(-(VfQj?CC8I@)ncVFE_tXQ&k~L!I*Vs6%}WHQs4d1a6@Ey+plTDaRnschV?> zL8z5y!VrwM)Ch!b3e#-G?0pY0e z3Zo`cYdrDSX>Ue_R@MtO<4>%UtxK^u^;=M{a;h-)Yu#K0UCljoSRVt@4J*nnZ^%%gZ-xc16?$+SDsn5(7k6MP z+>McV(AM9@l$8HL#&?~6$>?zSOg4L&1#3_)fFA6NTFG?O1eRa`uEAWm71QDc>rGVu z2dMsUZGD<4<~7cOT2M!??EgSA+LLkU!R4s;{2=NuUd1%{2K85|R8!5?4MYtXjp?u) zDx@_~dz^@xSYs@R{ZNrwfZC#6sPRvstISO@+S6yK_x?3%Z*xv(|1kkIz#!Dj=b$3C z%hq2)eYoDC2g7HW-~B3~?(2d&17FzkI$KVj!T#%kPpOchGmWvRm9;?)&;#}0DX7!E z88yN4sDa<32P2crLaJjR<=Uu7wLqPj_85#kPzxTJMErxujHMz2&a@5RphCF{b(+^> zG;YS?_=h!Qmf7=oYZFXOdneQadSe+JhB`x=P~+`FO>B=#Ml=1zb~ul^@w%=52ZJfU z!StA6wwb60HSuW7gq3Z5W7K$^P-kKQ>On&>Gmb_@ZZ4{yyN8Sp*-5O97f~zs%rPs; zhYctfN4=J#un-=`%=j4ffYfu%L^7bp%VW#MQ4gw$T37?r_-%}?^D!BHD!XG9T!lJZ zcTpirGtZbA^;&wc9L8c44nj?Q1%8M3P-kZLd~^D@p(b=4wRQJVTNJ)P6Jh`Jkx?j% zcq{nKqK9%7RA@V52o6R~Y!YU})wcZrDiRk^TXi4xHux+w-vtlqkd{D=(;OACUYLgG zJA=q*hAwJmlWm7tr~wzD_HrZY3~WQ4=EJD(#%a`B5wgfEq^vao_0z5y>TnN2-T%3D zHo6`vR*+Gs525zxG=}08%!O|Asxbof`W!_~BpDUK-%tzq%a$LZ_TE`yCJcKN?{W8>zt56UA!M5+gVw6vzBKaOOV%nwVyAh5W zzZxp^%~1<&x70Nqdr_f@j6^+P24=^lw)`V%z+bQ|UPMha_$%|k?5GguLq#A4HBM#J zX|IQha1&H}J5&U_xnwkOZ`7euSvSr{J>XkZXxF3q?M6i;8TDFTMeTjmGV>c!6VwN$ zAC|yDsEB-v8fOb?<@>B|G8sMS66zG+#4Pv{BQV3)=Ef-0jN{OQ@fe1kF*}Y%os~tl zeJd)W=TYO{K}F&{)<^$uyoc9ynvzMNVjgND*HG{EZPZG$E;p}D0n`dAVlJ$U`LGWv zw6jqW`U*<3B?6e}S3w{`;;l17|@!FfVH5rBQD|Q`F(5T4R1XeTkJR zZ^syXi4`$=tyxiD%ujh1R={0YO8rm|EVj-(Fa{OT3K)QO&>x#(8f>+W_-jwQP*DTN zp+bKQRe!^Fbk>`Yro|N0=R^&Z%bFh*k)o)xQVMnGYN8_433Zl++VTw48CvO*(cW%H z?cFb^3H**Z@v$vu++f-Zpk`hkHNhIFL)QuQfD!1y*{BEqfZhe6`rW{E_!<>)H}yty zV;BF#P!IkR%i$Y|xuu?HSNo$lh>&0dwpf|UE9-s5@bi;FP^m!U%Y8%E-L z^kC!;v(oCQ@q3}_r=Y$s>vj--h42&=`f$8Jg*wNN#!6U-a(mQ@CZh*eqPFNTYM@)F z`vZ2G_M)hAJ=AyuZ2c_M1h=B@ySS71tKuycg)#RoemTH;SQ=MaFQG!4X}2*FHSsbS zhiz^B64YVchz&63Pv&g&MMZQmY74$WO>mt{CXmc&)a!B;^}5`{toRtU*J*z?uVq$@ zpj-yCVKWTDewZ0QM?GL6YQif}hj<(6EFD8d^b+bVa8vCuzkbJ}1{jJurC;JWK6PKC zCX|1_*@9wNhH@>`1V^FH#(b=f`%&MAfCI*is0n1lP%LWet0NO~okUyF*4o9|$2!D1 z(mLKc4YT|3mr<<4z?%;8vB9@E0EZpoRmJ-_9Sx#|zV-iLjahzZE{;wvZy%~Gd zglr<}^;?LlUxRwTH(?sQifX@$3h66Ugwh@}^_fuhxls`&U^-LV2F`KZ^e=%rLviTAMAX*wL5({B^?g`q>sO=B#(s1) z({p6>fLo{szeWuZbi%A8KWfEgZMi0@y`?P=K;1VMwX!*w2iM#BGpGptiGldHt$%fb z_^TrDr1^0fh6-^E>VZ`;9X7J{?W{d8fcn80fi9~5QuM_Qs0VJr0{9~~$D3Fc%O~^3 z;K*d+U!2SXDs+k?PML|+!XlJAqe3+kHSluOgIA%pU^7<2UoZ|+oi^W-1T06n7iPef z7=+tU_Z>n_{E|yXhvE$?ggMWc2}GlZaw6)1eJ~?_irUjjwtfj}<*QJU+HO6FIy+}D zAO4PdEmNE|6G(%RlwA)Q4O|^H!{(?h>4N&e3_?wC8n(rasDaY|&-4q$w3PE=CXB{# zjJM^En1%9StcX*v3LZr!<~r%lnb)i&>cQnO1QXB?TVqS?VB2@1Udtn>2Pb0_{2gO4 z>bz<1i3)vx)K-o`MQQ`;zMs+i-~S&YqtIPLo!5`m6oI-i%9bl&Fy%xH z!wy&sN1#H!7Ig;BS_6MI&q+W{qzPu^{5hS-DAYqx15HOwXf5giJ5Yz^1S<6RQK$G{ z%#US%GZSu)dV6|cb{ve__pwa7j+1eQRDxL`hZ0f_^s<`r8d}PbPm&^n_s0rmmMWh5O0u@maY=SyttuGOO?;)W=hiwdM?VeSpqmR?K|GSPa!K0TqEn)N@*(p3@z52;CuMG|+e~ zkJC^OJcYYl5ju+zcmWlm=a?5$UNc)!1Pf6vi`ue}kqNlY z=VUaq*{BXHu^^sCo!-}&2R+x#O5#zGsE=XT1=W9yZC`8MhML$u)D|5=E$kF30=F+y#;qMKfXmhFz+Ac@Ki!gqyg%%wMVV6JAQ-%u_>NJy#1yJP@s1TOJqSzm`6-zM|kDv~v-(TizR6|9i zE9!xtpa(z4)VLD$+HF8ZWH0KwbK)=dU+?j4D)QiKR5{{~30XBnYwGKv-kLQSfcvcOaWdMI^OzlPTHm2op6!9z+v2G9 zdRQB~qXzmO)8kL5tviW9cn;P62kOE9V0-j`Xxh6V5pbQsWV9FaunKNQh3qM&#cYqv zgY%*Ws*IX&b5x`{q3-XC8E~R?fpraPA-hnKJcD{phR1r%+5bjlqNx~)>bM4V2KHhc zp2H@X`H6W@57YqTFdrU5P3S&qD_@~j9{kiyI2?0OE`^FrL)6>VUh;gWldb56;gox! zRyxVL47Jkjs1WZ*e>{pM@D!Fo-+#@ikHz$qTcIY_6LtTms0fWkjWY{fg?J$ueHgw) zeHgA`E)0KWK0tA(Q`;4Taj-2<#7vauq8_*!b^nj32R+A(nEJWd!tAJWX+lz51u+;xxe_Y0jcvIjW~TfJY9UiG6gQw=yTho7 z-+e*+m3d2rR*>PPnScj%V>#3VTVWIqMtyizqVD?>wYM*9IrA&C!UCv%u~-#{VpiOR z`SBbo5^r5HCCQ|JZGI?JL+w>R)J%t?_G$@M#ucb7yM<-(F)HMR-|=XgN`P_7N&{Jy8)EjSBG$)L~kQI^A2aIPOM8>ON`<(!VpO zJ13^5oEtTv!nVFKYC+AB@m!}Z8O^jODx^a(9;cuOPop0E7}f7RDnfzp&FhyH_24*E zzj~<9wnFvqjat}ntdCPrE5GEecllqlkA&#c=G13gIZsfm3Yzceed! zRHQDW9&{gT;ybL12|hmF(9c4xd;w}}mthRgcMgy#hi@<^mPug-Y>HZGXVi-NVNo1| z+RKfo75`w%`>jW?5cSEZ{;#YBe9bt`P=~P_y2^|uyn;FQvbUWFFLbRZtP=;qT*mLqC-YJ#Z6hpx;m-eQi6Y zO=%uf47DYVQ3LfyJ#c|---C+SpQy9+5Op?uQ~7wmsF_d^E{HnBHB-6fL5-*gqoO0G z!jabTsBiT&EQK?zhp`OhH>d}cOl_=+8n_|qEVROC>}BhhpvGH;THsojj85Y&)E=Kg zo!T3y*X|)|ApZcff-Kges4a*`9oBZJaR#H##6;9W=Agz~g8Blk#S(Y`HNN|tj81pD zG(O%hR#w#EYK{tJ8?1ueur01etvn#DIYgCFXQw4<0c|l0_Cu|30&1MOsEK@y>c0_r z8(e2A8GXriVKw|0bq30%GdHwCMW8!s?}njH^?WRehcO;s<5sL3=;QsF@(i`oEI~fr z4^b^t|3;_@jYsc)|38C_W;)kf!B0W-P+o@$=}GGiTmK9d^3e2V#YIv5;!rDZjGAZ< zTR#!?U0IAeV+SxbUPJHi|96z3;+bvm&0uDj4!sXTeK?Au4qGYI0M#%S>!Lnj6Hp6T zg9`Od^xzR&zKeR!3)DpXGxGiyBa@4aX5Ikx+H^%7u3@OHn2p-oZTKS|LG9tVOy;yt zM71ZOCb$AM&iAMZ9Y&3R0d?s9vF*OWy#Lv#$in|2mmU~}I(&6dD{6?kVKC}6PeMIl zCh9d?hTavU_I9VOe}IbIOVoEIeTbQ04C=mGw%j;`_g{P0nF>8h-yR74QLSLPav036w&8N#jwWZ-W}IC+dNtP;c2J)B@+Awset8Mu+7a)C2dSLU|8$ z<6G1UQ)MxG7ix{f_S8qCexA=neR7YYFFwcG_!@QEYlNB!HbiYj4^+K7nv7O51r>=| zw!;ftc*pS_7$iH9Y=k#Z=zQ2lg-Eb-xH+5 zM7{rsWE#@25Ec6SsJ(oLibM(ikzW&wM{Pw5)C9Vs&dy|1$XB2qxCM3ij-n!W8MQU{ zQ6WzmX8H$WW}feac{79(^}qxyj4e@n{yAzd7o%3P8Fjc$+4@^piSldIA&$*q9@G@I zkk+UznvROlFIWceVxWHh=L$E6qd4lvWqH)fTA*e;0QKGuwT?$UFbON;8Prw<=QI;7 zhl)Tw)Py@=1iGlLS&AC>5W0GgPmn2(XD|+fBFvB5dZ;ZKhzk8U)C!VN18hY_Y?p06 zi8{oWZGB3Q`A%fDhT{aKBK( zSOR~}bLc{W!e&t*;I<<{Zd)^&AI2N_1%TYHR zMIFMwP!oA;+k^6%_EMlV&8dz?l@m~V z+X?ky8G?$$H>kZ|k5RbQw%Ur;l@j_UZt)~79Iwj>hurK^JKS0A;)4ygCNKWYNwFaqaeMcjcM z@Hy&rZ&}=IVOwI=i6yfO^<(xq>b*@{PJbWf z=R8T*JvN+4JDKq_QZ-*wKbm|O>dWC%>Qa*b6o1jpTwjnMfvd0qeWJa!d^yQS`0D-R z+CsWadPh3Vjb&;4iZq_|KT@-}XqOZsrNp!Z)C)={^Hc3rK= z4uEdh4Mh0&j2^^ znH{Jao})a3wB6QKC*O$v^||+V{LYSX2RWBcG5m=>x;oMxL^?qIW>e*S??W6X(rE;h zyJ>ukIvXFZ&9sfNg=ypu(&sMjrr%^z2Fh1y&qf8iy{L8MTUzQek9lB!bH#gAI&JJN?Mk@~&dw}U!A z(n!jBCy%Az>*-5HOWX4@`8G+{tA@JCbZ=&dOCYaHZ`&Jse7Jg(ze8I}+ph;6BkA{= zdA46)Yenky)BBh$>nHwMQWEvS)ai}ZHJ371ZRd9~Aq>8k(nym2zjWxsr>i~nwYX^@ zsWs)FDBmOh4hxa^@#9>e{{ixqllE2%4*ZCk&ZGy_oJ+c1EzC_KH=DGXRMDAYs?=%Kq>kh`A=Op#?v)|zVA)eb-tw2 zINPAQWuzE7G$dX5PyH6kSt&22|G&5cm(%wZsWJI1w5P?1q|~&3Nxg@WzaSl@d~g_qAhnLKbZEx zl$+DmpK@L-p46dwu-lH>6_lpi-n#Q1sWEq?wRP<&@1z`0x=i1%DC_c}yp5!b-}aqe z^j|{z9LjIKwfquo$H;_(Y+Wn*ZZdh-R`IpvMqPi?cpdMPGE#R&m0TKU9_7}wrzKyN zd_g;Su)SCP>XB;Fr#fwKaV@qY-J*Ud=AuqNL|2fHPQmlPCNqcu{PBbx=u0~3DnOln zsn`K2@ja<6`AxK^Ctr!QfbwEeR`M}egY-G=^SJjub@fS)sY^roBkVxiaXY^KNyDk3 z@dAzdF+PGDVoBLa`UPkx>c_pVMf7V=8cy9mDlXA}s9%G+N|N@IcG~;DCa<5= zp_K37hwBUae{JtM^r4b(%!35~#J?DOCUwtAm&xBFWuk8@$`Lr2vG$XaDNn|;wEs6E>zI{8P`AHrs&Bjf|H}ok>`)u-kNuiW=4WJ)?)$m?%DV(IUH8Z=u)cr=C5BJL({>km>6>L=h%>i(jw7pXp}H1)ZtABj0=dx2%C*TvsNoN6ifOb?_| zS5rDHwvElnKQz@&e_Q9F-wo z6iA-G33&fzT@PQ9Hj*CLzGKKwAWbLfipAB;CAFRVTIw#@yxL3JS(Ue{uCcH8Zw9O)#d`f%My3aAs|4!1SAsqSHio`7{pQ~uLC&xhME-ac*?{%G@R9>P6( zDJ!YKRn)f4!CJIkWxV2;g4C7#3}5d*+nCP!^E@dpopaG)7uF;tl3zjnujFfxk0I?y zx?CsBElAFvq-z;2rpH1%EAlC(bfY8*|td9!l>&)-7Xw}x^9urPufJ%HJ7xG zd-!Xv^M-s@JEqzW>Q~BHbR0|NNm57BR?>RvQqzII<~W^5;gk>R4zBc+btPE&+oMy4 zd(P0O0qR;}@cwy`_WHJb7b}yR(RZJ>Z_=~6LGCAXSwT8a^=X<*krt63L#jZ%uKDD3 zE#S7o)IBFnp)NONH66#UWcar#@AVt`CDetG0?60Hp0uT;^$}^N?U&A%swq?yN}8A$ zmTfQH9?`Uil*&60-wEXP4!ezyL(y)TvZ3vX}pM|%3KqHk0ElJ^gp04grg zw%vB#V>>USZ7TVUq_wmSr{5^@-Kp0#3*+rQj%3-sEwr86Z`@{ z)2-wq$mb))k=K=gZz)eDeYiYi+K@`via%)!r{C8&j3>Mz^`l(Mj$ykw-6c*3@dB+OlCk&ZWG(M(N2>CejRk*2Z(ufA3-MiS~KB16V1 z`AKc*jM?aT*D%!uZ?dxzU^}4Q*s*pY>{Y(1Wj+s-xs}`f; zN87P6`7aqnS0ZUY`Cw9K(lvY2F57pjH3LqkZywq|CEpG|ru-H84Wvnw=b*0ZjB|;6 z6lojfH=4Ds%ruN5pNVvfd?8cqbfn`d@_9)q$d{x&4L+ccu5T!JBj1|zj`}_L8kxkoI3mZAMcFA*G@4%r>gS0&e)99YEzZwAZ1WNb08wt~TVianCq= zUs3vWBK4u|306t!-#E18uk=bs=>WYdk>V(?Cp{!BqkJ7dT$3pO&lXNlUxfQUT%BmE zPPsD`%VpB_#=(Ir|I_2AB%dZ>KE;y4n}pWNO??gSxWFh;-0_<70P@+WyH9FH-Ab%v zpMHgWf6_+!O``6q9k*f9h$f*e+fuWKnxAnZ$(NqlNxEv1lBvs1`i*=G`qjaVv`3<@ zpQ*cOvd&uiHKA=GH{|x>3=kJkc?+CCU|!iiwI!)1ZFQMxBRrAK1Nb rpQ7;{26c}0l!%HhQ8cPl(GUH$l;3+a(l;S7J}KySmMu}Y!W;h|AR2)& diff --git a/lib/lang/locale/id_ID/LC_MESSAGES/messages.po b/lib/lang/locale/id_ID/LC_MESSAGES/messages.po index d942d8c..3b584aa 100755 --- a/lib/lang/locale/id_ID/LC_MESSAGES/messages.po +++ b/lib/lang/locale/id_ID/LC_MESSAGES/messages.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Senayan3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-14 17:29+0700\n" -"PO-Revision-Date: 2012-04-14 17:29+0700\n" +"POT-Creation-Date: 2012-04-21 16:23+0700\n" +"PO-Revision-Date: 2012-04-21 16:23+0700\n" "Last-Translator: Arif Syamsudin \n" "Language-Team: Arie Nugraha; Hendro Wicaksono; Wardiyono \n" "Language: \n" @@ -21,79 +21,79 @@ msgstr "" "X-Poedit-Basepath: ../../../../../\n" "X-Poedit-SearchPath-0: .\n" -#: sysconfig.inc.php:525 +#: sysconfig.inc.php:529 msgid "Personal Name" msgstr "Nama Orang" -#: sysconfig.inc.php:526 +#: sysconfig.inc.php:530 msgid "Organizational Body" msgstr "Badan Organisasi" -#: sysconfig.inc.php:527 +#: sysconfig.inc.php:531 msgid "Conference" msgstr "Konferensi" -#: sysconfig.inc.php:530 +#: sysconfig.inc.php:534 msgid "Topic" msgstr "Topik" -#: sysconfig.inc.php:531 +#: sysconfig.inc.php:535 msgid "Geographic" msgstr "Geografis" -#: sysconfig.inc.php:532 +#: sysconfig.inc.php:536 msgid "Name" msgstr "Nama" -#: sysconfig.inc.php:533 +#: sysconfig.inc.php:537 msgid "Temporal" msgstr "Masa" -#: sysconfig.inc.php:534 +#: sysconfig.inc.php:538 msgid "Genre" msgstr "Aliran" -#: sysconfig.inc.php:535 +#: sysconfig.inc.php:539 msgid "Occupation" msgstr "Pekerjaan" -#: sysconfig.inc.php:538 +#: sysconfig.inc.php:542 msgid "Primary Author" msgstr "Pengarang Utama" -#: sysconfig.inc.php:539 +#: sysconfig.inc.php:543 msgid "Additional Author" msgstr "Pengarang Tambahan" -#: sysconfig.inc.php:540 +#: sysconfig.inc.php:544 msgid "Editor" msgstr "Penyunting" -#: sysconfig.inc.php:541 +#: sysconfig.inc.php:545 msgid "Translator" msgstr "Penerjemah" -#: sysconfig.inc.php:542 +#: sysconfig.inc.php:546 msgid "Director" msgstr "Direktur" -#: sysconfig.inc.php:543 +#: sysconfig.inc.php:547 msgid "Producer" msgstr "Produser" -#: sysconfig.inc.php:544 +#: sysconfig.inc.php:548 msgid "Composer" msgstr "Penggubah" -#: sysconfig.inc.php:545 +#: sysconfig.inc.php:549 msgid "Illustrator" msgstr "Ilustrator" -#: sysconfig.inc.php:546 +#: sysconfig.inc.php:550 msgid "Creator" msgstr "Pencipta" -#: sysconfig.inc.php:547 +#: sysconfig.inc.php:551 msgid "Contributor" msgstr "Kontributor" @@ -109,19 +109,23 @@ msgstr "Anda saat ini masuk sebagai anggota" msgid "LOGOUT" msgstr "KELUAR" -#: template/lightweight/index_template.inc.php:20 +#: template/lightweight/index_template.inc.php:53 msgid "Home" msgstr "Beranda depan" -#: template/lightweight/index_template.inc.php:21 +#: template/lightweight/index_template.inc.php:56 msgid "Library Information" msgstr "Info Perpustakaan" -#: template/lightweight/index_template.inc.php:22 +#: template/lightweight/index_template.inc.php:59 msgid "Help on Search" msgstr "Bantuan pencarian" -#: template/lightweight/index_template.inc.php:39 +#: template/lightweight/index_template.inc.php:62 +msgid "Full Site" +msgstr "Moda Non-bergerak" + +#: template/lightweight/index_template.inc.php:113 msgid "Search" msgstr "Pencarian" @@ -347,13 +351,10 @@ msgid "Quick Return Collection" msgstr "Pengembalian Kilat Koleksi" #: admin/default/submenu.php:33 -#: admin/modules/membership/submenu.php:28 -#: admin/modules/membership/index.php:292 msgid "Add New Member" msgstr "Tambah Anggota" #: admin/default/submenu.php:33 -#: admin/modules/membership/submenu.php:28 msgid "Add New Library Member Data" msgstr "Tambah Data Anggota Perpustakaan" @@ -846,6 +847,7 @@ msgstr "Toleransi Keterlambatan" #: admin/modules/membership/member_type.php:251 #: admin/modules/circulation/fines_list.php:229 +#: admin/modules/circulation/member_loan_hist.php:88 msgid "Found {result->num_rows} from your keywords" msgstr "Ditemukan {result->num_rows} dari pencarian Anda melalui kata kunci" @@ -930,16 +932,10 @@ msgid "You are going to edit fines data" msgstr "Anda akan menyunting data denda" #: admin/modules/circulation/member_loan_hist.php:62 -#: admin/modules/circulation/loan_list.php:96 -#: admin/modules/circulation/loan.php:141 -#: admin/modules/circulation/reserve_list.php:96 msgid "Item Code" msgstr "Kode Eksemplar" #: admin/modules/circulation/member_loan_hist.php:64 -#: admin/modules/circulation/loan_list.php:96 -#: admin/modules/circulation/circulation_action.php:291 -#: admin/modules/circulation/loan.php:141 msgid "Loan Date" msgstr "Tanggal Pinjam" @@ -2135,6 +2131,7 @@ msgstr "Laporan Pengunjung Perpustakaan" #: admin/modules/reporting/customs/visitor_report.php:66 #: admin/modules/reporting/customs/loan_by_class.php:101 #: admin/modules/reporting/customs/fines_report.php:81 +#: admin/modules/reporting/customs/visitor_report_day.php:81 msgid "Year" msgstr "Tahun" @@ -2142,6 +2139,7 @@ msgstr "Tahun" #: admin/modules/reporting/customs/loan_by_class.php:130 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:48 +#: admin/modules/reporting/customs/visitor_report_day.php:48 msgid "Jan" msgstr "Jan" @@ -2149,6 +2147,7 @@ msgstr "Jan" #: admin/modules/reporting/customs/loan_by_class.php:131 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:49 +#: admin/modules/reporting/customs/visitor_report_day.php:49 msgid "Feb" msgstr "Feb" @@ -2156,6 +2155,7 @@ msgstr "Feb" #: admin/modules/reporting/customs/loan_by_class.php:132 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:50 +#: admin/modules/reporting/customs/visitor_report_day.php:50 msgid "Mar" msgstr "Mar" @@ -2163,6 +2163,7 @@ msgstr "Mar" #: admin/modules/reporting/customs/loan_by_class.php:133 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:51 +#: admin/modules/reporting/customs/visitor_report_day.php:51 msgid "Apr" msgstr "Apr" @@ -2170,6 +2171,7 @@ msgstr "Apr" #: admin/modules/reporting/customs/loan_by_class.php:134 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:52 +#: admin/modules/reporting/customs/visitor_report_day.php:52 msgid "May" msgstr "Mei" @@ -2177,6 +2179,7 @@ msgstr "Mei" #: admin/modules/reporting/customs/loan_by_class.php:135 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:53 +#: admin/modules/reporting/customs/visitor_report_day.php:53 msgid "Jun" msgstr "Jun" @@ -2184,6 +2187,7 @@ msgstr "Jun" #: admin/modules/reporting/customs/loan_by_class.php:136 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:54 +#: admin/modules/reporting/customs/visitor_report_day.php:54 msgid "Jul" msgstr "Jul" @@ -2191,6 +2195,7 @@ msgstr "Jul" #: admin/modules/reporting/customs/loan_by_class.php:137 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:55 +#: admin/modules/reporting/customs/visitor_report_day.php:55 msgid "Aug" msgstr "Agu" @@ -2198,6 +2203,7 @@ msgstr "Agu" #: admin/modules/reporting/customs/loan_by_class.php:138 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:56 +#: admin/modules/reporting/customs/visitor_report_day.php:56 msgid "Sep" msgstr "Sep" @@ -2205,6 +2211,7 @@ msgstr "Sep" #: admin/modules/reporting/customs/loan_by_class.php:139 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:57 +#: admin/modules/reporting/customs/visitor_report_day.php:57 msgid "Oct" msgstr "Okt" @@ -2212,6 +2219,7 @@ msgstr "Okt" #: admin/modules/reporting/customs/loan_by_class.php:140 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:58 +#: admin/modules/reporting/customs/visitor_report_day.php:58 msgid "Nov" msgstr "Nop" @@ -2219,6 +2227,7 @@ msgstr "Nop" #: admin/modules/reporting/customs/loan_by_class.php:141 #: admin/modules/reporting/customs/loan_by_class.php:150 #: admin/modules/reporting/customs/fines_report.php:59 +#: admin/modules/reporting/customs/visitor_report_day.php:59 msgid "Dec" msgstr "Des" @@ -2301,6 +2310,7 @@ msgid "NON Decimal Classes" msgstr "Kelas Non-Desimal" #: admin/modules/reporting/customs/fines_report.php:94 +#: admin/modules/reporting/customs/visitor_report_day.php:94 msgid "Month" msgstr "Bulan" @@ -2490,6 +2500,7 @@ msgid "Document Publisher" msgstr "Penerbit Dokumen" #: admin/modules/master_file/submenu.php:29 +#: admin/modules/master_file/supplier.php:135 msgid "Supplier" msgstr "Agen" @@ -2519,7 +2530,7 @@ msgid "Document Content Language" msgstr "Bahasa Konten Dokumen" #: admin/modules/master_file/submenu.php:38 -#: admin/modules/master_file/label.php:167 +#: admin/modules/master_file/label.php:160 msgid "Label" msgstr "Label" @@ -2683,43 +2694,43 @@ msgstr "Kode Bahasa" msgid "You are going to edit language data" msgstr "Anda akan menyunting data bahasa" -#: admin/modules/master_file/label.php:115 +#: admin/modules/master_file/label.php:108 msgid "Label Data Successfully Updated" msgstr "Data Label Berhasil Diperbaharui" -#: admin/modules/master_file/label.php:117 +#: admin/modules/master_file/label.php:110 msgid "Label Data FAILED to Updated. Please Contact System Administrator" msgstr "Label GAGAL Diperbaharui. Hubungi Administrator Sistem" -#: admin/modules/master_file/label.php:123 +#: admin/modules/master_file/label.php:116 msgid "New Label Data Successfully Saved" msgstr "Label Baru Berhasil Disimpan" -#: admin/modules/master_file/label.php:125 +#: admin/modules/master_file/label.php:118 msgid "Label Data FAILED to Save. Please Contact System Administrator" msgstr "Label GAGAL Disimpan. Hubungi Administrator Sistem" -#: admin/modules/master_file/label.php:171 +#: admin/modules/master_file/label.php:164 msgid "Label List" msgstr "Daftar Label" -#: admin/modules/master_file/label.php:172 +#: admin/modules/master_file/label.php:165 msgid "Add New Label" msgstr "Tambah Label" -#: admin/modules/master_file/label.php:215 -#: admin/modules/master_file/label.php:246 -#: admin/modules/master_file/label.php:250 +#: admin/modules/master_file/label.php:208 +#: admin/modules/master_file/label.php:239 +#: admin/modules/master_file/label.php:243 msgid "Label Name" msgstr "Nama Label" -#: admin/modules/master_file/label.php:228 -#: admin/modules/master_file/label.php:245 -#: admin/modules/master_file/label.php:249 +#: admin/modules/master_file/label.php:221 +#: admin/modules/master_file/label.php:238 +#: admin/modules/master_file/label.php:242 msgid "Label Description" msgstr "Deskripsi Label" -#: admin/modules/master_file/label.php:232 +#: admin/modules/master_file/label.php:225 msgid "You are going to edit Label data" msgstr "Anda akan menyunting data Label" @@ -4026,6 +4037,7 @@ msgid "Type to search for existing topics or to add a new one" msgstr "Ketik untuk mencari topik atau menambah baru" #: admin/modules/bibliography/pop_topic.php:156 +#: admin/modules/bibliography/pop_author.php:155 msgid "Insert To Bibliography" msgstr "Sisipkan Dalam Bibliografi" From d07306edf2ef6667ee70bed210baccf7a67076ab Mon Sep 17 00:00:00 2001 From: Eddy Subratha Date: Sun, 22 Apr 2012 10:33:17 +0700 Subject: [PATCH 08/12] Modified : Member Login Area for Slims Mobile Template Fixed : Re-design Circulation List layout --- admin/admin_template/default/style.css | 12 +++- template/lightweight/index_template.inc.php | 16 +++-- template/lightweight/style.css | 76 +++++++++++++++++++-- 3 files changed, 94 insertions(+), 10 deletions(-) diff --git a/admin/admin_template/default/style.css b/admin/admin_template/default/style.css index c885737..91e7f56 100755 --- a/admin/admin_template/default/style.css +++ b/admin/admin_template/default/style.css @@ -410,6 +410,11 @@ a.printReport:active { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } +#pageContent +{ + height: 100% !important; +} + #pageContent div { background-color:#fff !important; } @@ -981,7 +986,7 @@ icon #listsFrame { width: 100%; - height: 100%; + height: 600px !important; } #iframeDragger { @@ -1046,4 +1051,9 @@ input.small_input { .mceToolbar table td { border: 0; +} + +.highlighted +{ + background-color:#ffde5a !important; } \ No newline at end of file diff --git a/template/lightweight/index_template.inc.php b/template/lightweight/index_template.inc.php index 21f18af..e76ed04 100755 --- a/template/lightweight/index_template.inc.php +++ b/template/lightweight/index_template.inc.php @@ -1,11 +1,10 @@ array('url' => 'index.php?p=help', 'text' => __('Help on Search') ), - 'site' => array('url' => 'index.php?fullsite=1', - 'text' => __('Full Site') + 'site' => array('url' => 'index.php?p=member', + 'text' => __('Member Area') ) ); @@ -115,7 +114,12 @@
    -
    +
    + +
    + +
    +
    @@ -137,7 +141,9 @@
    + Fullsite
    +
    diff --git a/template/lightweight/style.css b/template/lightweight/style.css index 1892a84..e6bbf7f 100755 --- a/template/lightweight/style.css +++ b/template/lightweight/style.css @@ -183,6 +183,13 @@ select { border-bottom:solid 1px #efefef; } + +.subinfo +{ + background-color: #efefef; + padding:10px; + color:#999999; +} /*----------------------------------------------------------------*/ /* Item Layout */ /*----------------------------------------------------------------*/ @@ -261,15 +268,24 @@ select { padding:5px; } -.keywords, .search +.keywords, +.search, +.biblioMarkFormAction input, +.memberDetail input, +#loginButton, +a.basket, +#memberLogout, +.login_input input, +.memberButton { - padding: 6px; + padding:5px; border: none; border-radius: 50px; -moz-border-radius: 50px; -webkit-border-radius: 50px; -webkit-appearance: none; outline: 0; + cursor: pointer; } .keywords @@ -293,6 +309,39 @@ select { padding: 6px 15px; } +.biblioMarkFormAction +{ + padding:10px 0px; +} + +.biblioMarkFormAction input, +#loginButton, +a.basket, +#memberLogout, +.memberButton +{ + color: #ffffff; + background: #93d176; + border: solid 1px #75c450; + padding: 8px; +} + +.subItem label +{ + font-size:12px; + color:#d16446; +} + +.memberBasketAction +{ + padding:10px 0px; +} + +#memberLogout +{ + padding:4px 7px; + clear: both; +} /*----------------------------------------------------------------*/ /* Detail Layout */ /*----------------------------------------------------------------*/ @@ -313,13 +362,32 @@ select { text-align: right; } -.content h3 +.content h3, .memberInfoHead { color: #df7568; - font-size:20px; + font-size:16px; letter-spacing: -1px; } +/*----------------------------------------------------------------*/ +/* Member Layout */ +/*----------------------------------------------------------------*/ +.memberDetail, .memberLoanList +{ + width:100%; +} +.memberDetail td, .memberLoanList td +{ + padding:3px ; + border-bottom: dotted 1px #999; +} + +.dataListHeader a +{ + color:#333333; + font-weight:bold; +} + /*----------------------------------------------------------------*/ /* Footer Layout */ /*----------------------------------------------------------------*/ From 710185f913c9f75d561092f1624d6c7b2c0cecbf Mon Sep 17 00:00:00 2001 From: Eddy Subratha Date: Sun, 22 Apr 2012 10:53:23 +0700 Subject: [PATCH 09/12] Modified : Change the layout of page information for Slims Mobile Template --- template/lightweight/index_template.inc.php | 9 +++++---- template/lightweight/style.css | 7 ++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/template/lightweight/index_template.inc.php b/template/lightweight/index_template.inc.php index e76ed04..e85ab74 100755 --- a/template/lightweight/index_template.inc.php +++ b/template/lightweight/index_template.inc.php @@ -114,11 +114,12 @@
    -
    - -
    - +
    + +
    + +
    diff --git a/template/lightweight/style.css b/template/lightweight/style.css index e6bbf7f..6bff595 100755 --- a/template/lightweight/style.css +++ b/template/lightweight/style.css @@ -362,13 +362,18 @@ a.basket, text-align: right; } -.content h3, .memberInfoHead +.content h3, .memberInfoHead, .tagline, .fieldLabel { color: #df7568; font-size:16px; letter-spacing: -1px; } +.loginInfo +{ + padding-top:5px; +} + /*----------------------------------------------------------------*/ /* Member Layout */ /*----------------------------------------------------------------*/ From 7121a7e347de8c196198a06611d9fbba576237d2 Mon Sep 17 00:00:00 2001 From: Eddy Subratha Date: Sun, 22 Apr 2012 11:00:35 +0700 Subject: [PATCH 10/12] Modified : Errorbox message on Login Member Area --- template/lightweight/style.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/template/lightweight/style.css b/template/lightweight/style.css index 6bff595..1115427 100755 --- a/template/lightweight/style.css +++ b/template/lightweight/style.css @@ -276,7 +276,8 @@ select { a.basket, #memberLogout, .login_input input, -.memberButton +.memberButton, +.errorBox { padding:5px; border: none; @@ -326,6 +327,15 @@ a.basket, padding: 8px; } +.errorBox +{ + color: #ffffff; + background: #df7569; + border: solid 1px #d64f3f; + padding: 8px; + text-align: center; +} + .subItem label { font-size:12px; @@ -374,6 +384,7 @@ a.basket, padding-top:5px; } + /*----------------------------------------------------------------*/ /* Member Layout */ /*----------------------------------------------------------------*/ From eca34b8765cc981743ad412ad0b1fdad29d04c5f Mon Sep 17 00:00:00 2001 From: Eddy Subratha Date: Sun, 22 Apr 2012 11:30:33 +0700 Subject: [PATCH 11/12] Modified : Some modification inside admin theme for better layout --- admin/admin_template/default/style.css | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/admin/admin_template/default/style.css b/admin/admin_template/default/style.css index 91e7f56..6e88a63 100755 --- a/admin/admin_template/default/style.css +++ b/admin/admin_template/default/style.css @@ -241,6 +241,7 @@ header background-size: 20px 20px; margin-left: 20px; margin-right: 10px; + margin-top:5px; } @@ -585,11 +586,22 @@ table, tr, td, th { background-color:#eee !important; } - .fullWidth { width: 100%; } +.mceToolbar tr td +{ + + padding:0px !important; + margin:0px !important; + border-top: none !important; + border-left: none !important; + border-right: none !important; + border-bottom: none !important; + +} + /*---------- contentdisk From 7ca2aeea6eb119fd15251deb578b9fa528c725ec Mon Sep 17 00:00:00 2001 From: Eddy Subratha Date: Sun, 22 Apr 2012 14:37:07 +0700 Subject: [PATCH 12/12] Modification : Link for Social Apps button --- template/lightweight/index_template.inc.php | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/template/lightweight/index_template.inc.php b/template/lightweight/index_template.inc.php index e85ab74..c1b7711 100755 --- a/template/lightweight/index_template.inc.php +++ b/template/lightweight/index_template.inc.php @@ -67,20 +67,20 @@ you may modified as you need. ----------------------------------------------------*/ $social = array ( - 'facebook' => array('url' => 'http://www.facebook.com/groups/senayan.slims/', - 'text' => 'Facebook' + 'facebook' => array( 'url' => 'http://www.facebook.com/groups/senayan.slims/', + 'text' => 'Facebook' ), - 'twitter' => array('url' => 'http://twitter.com/#!/slims_official', - 'text' => 'Twitter' + 'twitter' => array( 'url' => 'http://twitter.com/#!/slims_official', + 'text' => 'Twitter' ), - 'youtube' => array('url' => 'http://www.youtube.com/user/senayanslims', - 'text' => 'Youtube' + 'youtube' => array( 'url' => 'http://www.youtube.com/user/senayanslims', + 'text' => 'Youtube' ), - 'gihub' => array('url' => 'https://github.com/slims/', - 'text' => 'Github' + 'gihub' => array( 'url' => 'https://github.com/slims/', + 'text' => 'Github' ), - 'forum' => array('url' => 'http://slims.web.id/forum/', - 'text' => 'Forum' + 'forum' => array( 'url' => 'http://slims.web.id/forum/', + 'text' => 'Forum' ) ); @@ -133,7 +133,7 @@ 0) { ?>