Merge branch 'master' of github.com:slims/slims7_cendana

admin/modules/reporting/customs/fines_report.php

@@ -141,7 +141,7 @@
     $output = simbio_date::generateCalendar($selected_year, $selected_month, $fines_data);
 
     // print out
-    echo '<div class="printPageInfo">Fines Count Report for year <strong>'.$selected_year.'</strong>, month <strong>'.$selected_month.'</strong> <a class="printReport" onclick="window.print()" href="#">'.__('Print Current Page').'</a></div>'."\n";
+    echo '<div class="printPageInfo">Fines Count Report for <strong>'.$months[$selected_month].', '.$selected_year.'</strong> <a class="printReport" onclick="window.print()" href="#">'.__('Print Current Page').'</a></div>'."\n";
     echo $output;
 
     $content = ob_get_clean();

admin/modules/reporting/customs/titles_list.php

@@ -162,7 +162,7 @@
     ob_start();
     // create datagrid
     $reportgrid = new report_datagrid();
-    $reportgrid->setSQLColumn('b.biblio_id', 'b.title AS \''.__('Title').'\'', 'COUNT(item_id) AS '.__('Copies').'',
+    $reportgrid->setSQLColumn('b.biblio_id', 'b.title AS \''.__('Title').'\'', 'COUNT(item_id) AS \''.__('Copies').'\'',
 		'pl.place_name AS \''.__('Publishing Place').'\'',
 		'pb.publisher_name AS \''.__('Publisher').'\'',
         'b.isbn_issn AS \''.__('ISBN/ISSN').'\'',
@@ -282,7 +282,7 @@ function showTitleAuthors($obj_db, $array_data)
     echo 'parent.$(\'#pagingBox\').html(\''.str_replace(array("\n", "\r", "\t"), '', $reportgrid->paging_set).'\');'."\n";
     echo '</script>';
 
-	$xlsquery = 'SELECT b.biblio_id, b.title AS \''.__('Title').'\', COUNT(item_id) AS '.__('Copies').
+	$xlsquery = 'SELECT b.biblio_id, b.title AS \''.__('Title').'\', COUNT(item_id) AS \''.__('Copies').'\''.
 		', pl.place_name AS \''.__('Publishing Place').'\''.
 		', pb.publisher_name AS \''.__('Publisher').'\''.
 		',  b.isbn_issn AS \''.__('ISBN/ISSN').'\', b.call_number AS \''.__('Call Number').'\' FROM '.

admin/modules/reporting/customs/visitor_report_day.php

@@ -89,8 +89,6 @@
             echo simbio_form_element::selectList('year', $year_options, $current_year);
             ?>
             </div>
-        </div>
-        <div class="divRow">
             <div class="divRowLabel"><?php echo __('Month'); ?></div>
             <div class="divRowContent">
             <?php
@@ -139,7 +137,7 @@
     $output = simbio_date::generateCalendar($selected_year, $selected_month, $visitor_data);
 
     // print out
-    echo '<div class="printPageInfo">Visitor Report for year <strong>'.$selected_year.'</strong> <a class="printReport" onclick="window.print()" href="#">'.__('Print Current Page').'</a></div>'."\n";
+    echo '<div class="printPageInfo">Visitor Report for <strong>'.$months[$selected_month].', '.$selected_year.'</strong> <a class="printReport" onclick="window.print()" href="#">'.__('Print Current Page').'</a></div>'."\n";
     echo $output;
 
     $content = ob_get_clean();

changes.txt

@@ -1,4 +1,6 @@
 SENAYAN 3 Stable Branch
+SLiMS 5
+SLiMS 7
 Changes Log
 
 Developers :
@@ -7,19 +9,34 @@ Arie Nugraha ([email protected], [email protected])
 Wardiyono ([email protected])
 Purwoko ([email protected], [email protected])
 Sulfan Zayd ([email protected])
-Arif Syamsudin (buitenzorg812@lc.vlsm.org, [email protected])
+Arif Syamsudin (buitenzorg812@yahoo.com, [email protected])
 Rasyid Ridho ([email protected], [email protected])
 Eddy Subratha ([email protected])
 Indra Sutriadi ([email protected])
 
 Localisation contributors :
-Tobias Zeumer ([email protected])
-Jhon Urrego Felipe Mejia ([email protected])
-Prasitichai เรารักในหลวง
-A. K. M. Nurul Alam
+Germany: Tobias Zeumer ([email protected])
+???: Jhon Urrego Felipe Mejia ([email protected])
+Thai: Prasitichai เรารักในหลวง
+Bengali: A. K. M. Nurul Alam
+Persian: Mohammad Javad Mansourzadeh
+Arabic: Rasyid Ridho
+Malay: ???
+Brazilian Portuguese: ???
+Spain: ???
 
 THANKS TO OUR USERS AND COMMUNITIES, YOU ARE DEVELOPERS TOO!
 
+SLiMS 7 (Cendana)
+========================================================================
+Added: Persian translation
+Added: Cendana Responsive template
+Added: Comment field in OPAC
+Added: Membercard generator
+Added: Tooltip in New Bibliography field
+Fixed: Bugs in Custom Reports
+Modified: Type ahead value for Publisher, Publishing Place, Classification
+
 
 SLIMS 5 (Meranti)
 ========================================================================

lib/contents/slimsinfo.inc.php

@@ -34,27 +34,38 @@
 
 ?>
 <div style="padding-left: 10px;">
-<h2>SLiMS Version 3 Stable 15 (Matoa)</h2>
+<h2>SLiMS Version 7 codename Cendana</h2>
 <p>&nbsp;</p>
 <p>
 SLiMS (Senayan Library Management System)<br />
-Copyright (c) 2007-2010 Senayan Developer Community<br />
-Simbio Engine v2.0, Copyright (c) 2007-2010 Arie Nugraha
+Copyright (c) 2007-2013 Senayan Developer Community<br />
+Simbio Engine v2.0, Copyright (c) 2007-2013 Arie Nugraha
 </p>
 
 <p>
 <div style="font-weight:bold;">Developers:</div>
 Lead Developer: Hendro Wicaksono<br />
-Programmer: Arie Nugraha, Hendro Wicaksono, Tobias Zeumer, Wardiyono<br />
-Documentation: Arif Buitenzorg, Hendro Wicaksono, Purwoko (lead), Rasyid Ridho, Sulfan Zayd, Wardiyono
+Programmer: Arie Nugraha, Hendro Wicaksono, Tobias Zeumer, Wardiyono, Indra Sutriadi, Eddy Subratha<br />
+Documentation: Purwoko (lead), Arif Syamsudin, Hendro Wicaksono, Rasyid Ridho, Sulfan Zayd, Wardiyono
+</p>
+
+<p>
+<div style="font-weight:bold;">Translator:</div>
+Germany: Tobias Zeumer<br />
+Arabic: Rasyid Ridho<br />
+Thai: Prasitichai 2Õ22Ò32Ó82Ò32Ó72Î92Õ52Ñ32Ó12Ò52Ò72Ï5<br />
+Persian: Mohammad Javad Mansourzadeh<br />
+Malay: <br />
+Brazilian Portuguese: <br />
+Spain: <br />
+Bengali: A. K. M. Nurul Alam
 </p>
 
 <p>
 <div style="font-weight:bold;">Contribution:</div>
-Simbio Engine (Arie Nugraha)<br />
-PHP-based template system: Hendro Wicaksono<br />
-Blue Template: Eddie Subratha<br />
-Gettext Support: Tobias Zeumer<br />
+Gettext support: Tobias Zeumer<br />
+Membercard modification: Jushadi<br />
+English documentation: Jim Richardson
 </p>
 
 </div>