Skip to content
Browse files

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

  • Loading branch information...
2 parents ba495f3 + b75c21e commit 9efba52dd251cf95410857f23cfaeda2c2d9245d @buitenzorg812 buitenzorg812 committed Mar 25, 2012
Showing with 24 additions and 17 deletions.
  1. +2 −2 index.php
  2. +16 −14 lib/detail.inc.php
  3. +4 −0 template/default/detail_template.php
  4. +2 −1 template/default/index_template.inc.php
View
4 index.php
@@ -64,11 +64,11 @@
if (file_exists(LIB_DIR.'contents/'.$path.'.inc.php')) {
include LIB_DIR.'contents/'.$path.'.inc.php';
if ($path != 'show_detail') {
- $metadata = '<meta name="robots" content="noindex, nofollow">';
+ $metadata = '<meta name="robots" content="noindex, follow">';
}
} else {
// get content data from database
- $metadata = '<meta name="robots" content="index, nofollow">';
+ $metadata = '<meta name="robots" content="index, follow">';
include LIB_DIR.'content.inc.php';
$content = new content();
$content_data = $content->get($dbs, $path);
View
30 lib/detail.inc.php
@@ -59,12 +59,13 @@ public function __construct($obj_db, $int_detail_id, $str_output_format = 'html'
$this->obj_db = $obj_db;
$this->detail_id = $int_detail_id;
- $_sql = sprintf('SELECT b.*, l.language_name, p.publisher_name, pl.place_name AS \'publish_place\', gmd.gmd_name, fr.frequency FROM biblio AS b
+ $_sql = sprintf('SELECT b.*, l.language_name, p.publisher_name, sr.sor, pl.place_name AS \'publish_place\', gmd.gmd_name, fr.frequency FROM biblio AS b
LEFT JOIN mst_gmd AS gmd ON b.gmd_id=gmd.gmd_id
LEFT JOIN mst_language AS l ON b.language_id=l.language_id
LEFT JOIN mst_publisher AS p ON b.publisher_id=p.publisher_id
LEFT JOIN mst_place AS pl ON b.publish_place_id=pl.place_id
LEFT JOIN mst_frequency AS fr ON b.frequency_id=fr.frequency_id
+ LEFT JOIN mst_sor AS sr ON b.sor_id=sr.sor_id
WHERE biblio_id=%d', $int_detail_id);
// for debugging purpose only
// die($_sql);
@@ -128,19 +129,20 @@ protected function htmlOutput()
// get title and set it to public record_title property
$this->record_title = $this->record_detail['title'];
- $this->metadata .= '<meta name="Title" content="'.$this->record_title.'" />';
- $this->metadata .= '<meta name="Edition" content="'.$this->record_detail['edition'].'" />';
- $this->metadata .= '<meta name="Call Number" content="'.$this->record_detail['call_number'].'" />';
- $this->metadata .= '<meta name="ISBN/ISSN" content="'.$this->record_detail['isbn_issn'].'" />';
- $this->metadata .= '<meta name="Classification" content="'.$this->record_detail['classification'].'" />';
- $this->metadata .= '<meta name="Series Title" content="'.$this->record_detail['series_title'].'" />';
- $this->metadata .= '<meta name="Media" content="'.$this->record_detail['gmd_name'].'" />';
- $this->metadata .= '<meta name="Language" content="'.$this->record_detail['language_name'].'" />';
- $this->metadata .= '<meta name="Publisher" content="'.$this->record_detail['publisher_name'].'" />';
- $this->metadata .= '<meta name="Publish Year" content="'.$this->record_detail['publish_year'].'" />';
- $this->metadata .= '<meta name="Publish Place" content="'.$this->record_detail['publish_place'].'" />';
- $this->metadata .= '<meta name="Physical Description" content="'.$this->record_detail['collation'].'" />';
- $this->metadata .= '<meta name="Notes" content="'.strip_tags($this->record_detail['notes']).'" />';
+ $this->metadata .= '<meta name="Title" content="'.$this->record_title.'" />'."\n";
+ $this->metadata .= '<meta name="Edition" content="'.$this->record_detail['edition'].'" />'."\n";
+ $this->metadata .= '<meta name="Call Number" content="'.$this->record_detail['call_number'].'" />'."\n";
+ $this->metadata .= '<meta name="ISBN/ISSN" content="'.$this->record_detail['isbn_issn'].'" />'."\n";
+ $this->metadata .= '<meta name="Classification" content="'.$this->record_detail['classification'].'" />'."\n";
+ $this->metadata .= '<meta name="Series Title" content="'.$this->record_detail['series_title'].'" />'."\n";
+ $this->metadata .= '<meta name="Media" content="'.$this->record_detail['gmd_name'].'" />'."\n";
+ $this->metadata .= '<meta name="Language" content="'.$this->record_detail['language_name'].'" />'."\n";
+ $this->metadata .= '<meta name="Publisher" content="'.$this->record_detail['publisher_name'].'" />'."\n";
+ $this->metadata .= '<meta name="Publish Year" content="'.$this->record_detail['publish_year'].'" />'."\n";
+ $this->metadata .= '<meta name="Publish Place" content="'.$this->record_detail['publish_place'].'" />'."\n";
+ $this->metadata .= '<meta name="Physical Description" content="'.$this->record_detail['collation'].'" />'."\n";
+ $this->metadata .= '<meta name="Notes" content="'.strip_tags($this->record_detail['notes']).'" />'."\n";
+ $this->metadata .= '<meta name="Statement of Responsibility" content="'.$this->record_detail['sor'].'" />'."\n";
// check image
if (!empty($this->record_detail['image'])) {
View
4 template/default/detail_template.php
@@ -9,6 +9,10 @@
<td class="tblContent" style="width: 80%;" valign="top">{title}</td>
</tr>
<tr>
+<td class="tblHead" style="width: 20%;" valign="top"><?php print __('Statement of Responsibility'); ?></td>
+<td class="tblContent" style="width: 80%;" valign="top">{sor}</td>
+</tr>
+<tr>
<td class="tblHead" style="width: 20%;" valign="top"><?php print __('Edition'); ?></td>
<td class="tblContent" style="width: 80%;" valign="top">{edition}</td>
</tr>
View
3 template/default/index_template.inc.php
@@ -28,7 +28,8 @@
<![endif]-->
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/form.js"></script>
-<script type="text/javascript" src="js/gui.js"></script>
+<script type="text/javascript" src="js/gui.js"></script>
+<?php echo $metadata; ?>
</head>
<body class="not-front logged-in page-node node-type-page one-sidebar sidebar-left">

0 comments on commit 9efba52

Please sign in to comment.
Something went wrong with that request. Please try again.