Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 9efba52dd251cf95410857f23cfaeda2c2d9245d 2 parents ba495f3 + b75c21e
Arif Syamsudin buitenzorg812 authored
4 index.php
@@ -64,11 +64,11 @@
64 64 if (file_exists(LIB_DIR.'contents/'.$path.'.inc.php')) {
65 65 include LIB_DIR.'contents/'.$path.'.inc.php';
66 66 if ($path != 'show_detail') {
67   - $metadata = '<meta name="robots" content="noindex, nofollow">';
  67 + $metadata = '<meta name="robots" content="noindex, follow">';
68 68 }
69 69 } else {
70 70 // get content data from database
71   - $metadata = '<meta name="robots" content="index, nofollow">';
  71 + $metadata = '<meta name="robots" content="index, follow">';
72 72 include LIB_DIR.'content.inc.php';
73 73 $content = new content();
74 74 $content_data = $content->get($dbs, $path);
30 lib/detail.inc.php
@@ -59,12 +59,13 @@ public function __construct($obj_db, $int_detail_id, $str_output_format = 'html'
59 59
60 60 $this->obj_db = $obj_db;
61 61 $this->detail_id = $int_detail_id;
62   - $_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
  62 + $_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
63 63 LEFT JOIN mst_gmd AS gmd ON b.gmd_id=gmd.gmd_id
64 64 LEFT JOIN mst_language AS l ON b.language_id=l.language_id
65 65 LEFT JOIN mst_publisher AS p ON b.publisher_id=p.publisher_id
66 66 LEFT JOIN mst_place AS pl ON b.publish_place_id=pl.place_id
67 67 LEFT JOIN mst_frequency AS fr ON b.frequency_id=fr.frequency_id
  68 + LEFT JOIN mst_sor AS sr ON b.sor_id=sr.sor_id
68 69 WHERE biblio_id=%d', $int_detail_id);
69 70 // for debugging purpose only
70 71 // die($_sql);
@@ -128,19 +129,20 @@ protected function htmlOutput()
128 129
129 130 // get title and set it to public record_title property
130 131 $this->record_title = $this->record_detail['title'];
131   - $this->metadata .= '<meta name="Title" content="'.$this->record_title.'" />';
132   - $this->metadata .= '<meta name="Edition" content="'.$this->record_detail['edition'].'" />';
133   - $this->metadata .= '<meta name="Call Number" content="'.$this->record_detail['call_number'].'" />';
134   - $this->metadata .= '<meta name="ISBN/ISSN" content="'.$this->record_detail['isbn_issn'].'" />';
135   - $this->metadata .= '<meta name="Classification" content="'.$this->record_detail['classification'].'" />';
136   - $this->metadata .= '<meta name="Series Title" content="'.$this->record_detail['series_title'].'" />';
137   - $this->metadata .= '<meta name="Media" content="'.$this->record_detail['gmd_name'].'" />';
138   - $this->metadata .= '<meta name="Language" content="'.$this->record_detail['language_name'].'" />';
139   - $this->metadata .= '<meta name="Publisher" content="'.$this->record_detail['publisher_name'].'" />';
140   - $this->metadata .= '<meta name="Publish Year" content="'.$this->record_detail['publish_year'].'" />';
141   - $this->metadata .= '<meta name="Publish Place" content="'.$this->record_detail['publish_place'].'" />';
142   - $this->metadata .= '<meta name="Physical Description" content="'.$this->record_detail['collation'].'" />';
143   - $this->metadata .= '<meta name="Notes" content="'.strip_tags($this->record_detail['notes']).'" />';
  132 + $this->metadata .= '<meta name="Title" content="'.$this->record_title.'" />'."\n";
  133 + $this->metadata .= '<meta name="Edition" content="'.$this->record_detail['edition'].'" />'."\n";
  134 + $this->metadata .= '<meta name="Call Number" content="'.$this->record_detail['call_number'].'" />'."\n";
  135 + $this->metadata .= '<meta name="ISBN/ISSN" content="'.$this->record_detail['isbn_issn'].'" />'."\n";
  136 + $this->metadata .= '<meta name="Classification" content="'.$this->record_detail['classification'].'" />'."\n";
  137 + $this->metadata .= '<meta name="Series Title" content="'.$this->record_detail['series_title'].'" />'."\n";
  138 + $this->metadata .= '<meta name="Media" content="'.$this->record_detail['gmd_name'].'" />'."\n";
  139 + $this->metadata .= '<meta name="Language" content="'.$this->record_detail['language_name'].'" />'."\n";
  140 + $this->metadata .= '<meta name="Publisher" content="'.$this->record_detail['publisher_name'].'" />'."\n";
  141 + $this->metadata .= '<meta name="Publish Year" content="'.$this->record_detail['publish_year'].'" />'."\n";
  142 + $this->metadata .= '<meta name="Publish Place" content="'.$this->record_detail['publish_place'].'" />'."\n";
  143 + $this->metadata .= '<meta name="Physical Description" content="'.$this->record_detail['collation'].'" />'."\n";
  144 + $this->metadata .= '<meta name="Notes" content="'.strip_tags($this->record_detail['notes']).'" />'."\n";
  145 + $this->metadata .= '<meta name="Statement of Responsibility" content="'.$this->record_detail['sor'].'" />'."\n";
144 146
145 147 // check image
146 148 if (!empty($this->record_detail['image'])) {
4 template/default/detail_template.php
@@ -9,6 +9,10 @@
9 9 <td class="tblContent" style="width: 80%;" valign="top">{title}</td>
10 10 </tr>
11 11 <tr>
  12 +<td class="tblHead" style="width: 20%;" valign="top"><?php print __('Statement of Responsibility'); ?></td>
  13 +<td class="tblContent" style="width: 80%;" valign="top">{sor}</td>
  14 +</tr>
  15 +<tr>
12 16 <td class="tblHead" style="width: 20%;" valign="top"><?php print __('Edition'); ?></td>
13 17 <td class="tblContent" style="width: 80%;" valign="top">{edition}</td>
14 18 </tr>
3  template/default/index_template.inc.php
@@ -28,7 +28,8 @@
28 28 <![endif]-->
29 29 <script type="text/javascript" src="js/jquery.js"></script>
30 30 <script type="text/javascript" src="js/form.js"></script>
31   -<script type="text/javascript" src="js/gui.js"></script>
  31 +<script type="text/javascript" src="js/gui.js"></script>
  32 +<?php echo $metadata; ?>
32 33 </head>
33 34
34 35 <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.