Merge branch 'master'

sandboxgangster · Mar 16, 2014 · 62ce8da · 62ce8da
2 parents 0587638 + 6b1b344
commit 62ce8da
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 22 deletions.
diff --git a/index.php b/index.php
@@ -94,7 +94,7 @@
     *********************************************************************************/
 
     if (count($messages) == 0)
-        $html->set_meta(array('no_body' => true)); // no <body></body> in header and footer because of the <frameset></frameset>
+        $html->set_meta(array('frameset' => true));
 
     $html->print_header($messages, 'index.php');
 

diff --git a/lib/class.HTML.php b/lib/class.HTML.php
@@ -100,7 +100,7 @@ public function __construct($theme, $custom_css_file = '', $page_title = '')
             settype($this->meta['theme'],               'string');
             settype($this->meta['title'],               'string');
             settype($this->meta['custom_css'],          'string');
-            settype($this->meta['no_body'],             'boolean');
+            settype($this->meta['frameset'],            'boolean');
 
             // check passed parameters
             if (($theme != 'standard') && ( ! is_readable(BASE.'/templates/'.$theme."/partdb.css" )))
@@ -125,7 +125,7 @@ public function __construct($theme, $custom_css_file = '', $page_title = '')
             $this->meta['theme']        = $theme;
             $this->meta['custom_css']   = $custom_css_file;
             $this->meta['title']        = $page_title;
-            $this->meta['no_body']      = false;
+            $this->meta['frameset']     = false;
         }
 
         /********************************************************************************
@@ -348,7 +348,7 @@ public function print_header($messages = array(), $reload_link = '', $messages_d
             $tmpl->setVar('http_charset',               $config['html']['http_charset']);
             $tmpl->setVar('body_onload',                $this->body_onload);
             $tmpl->setVar('theme',                      $this->meta['theme']);
-            $tmpl->setVar('no_body',                    $this->meta['no_body']);
+            $tmpl->setVar('frameset',                   $this->meta['frameset']);
             if (strlen($this->meta['custom_css']) > 0)
                 $tmpl->setVar('custom_css', 'templates/custom_css/'.$this->meta['custom_css']);
 
@@ -475,7 +475,7 @@ public function print_footer($messages = array(), $messages_div_title = '')
                 $tmpl = new vlibTemplate($vlib_foot);
 
             $tmpl->setVar('relative_path',  BASE_RELATIVE.'/'); // constant from start_session.php
-            $tmpl->setVar('no_body',        $this->meta['no_body']);
+            $tmpl->setVar('frameset',       $this->meta['frameset']);
 
             // messages
             if ((is_array($messages) && (count($messages) > 0)))

diff --git a/templates/standard/edit_part_info.php/vlib_part.tmpl b/templates/standard/edit_part_info.php/vlib_part.tmpl
@@ -108,16 +108,7 @@
                         </td>
                     </tr>
                 {/TMPL_UNLESS}
-<!--            <tr>
-                    <td>
-                        <b>Öffentlich sichtbar:</b>
-                    </td>
-TODO:               <td>
-remove this             <input type="checkbox" name="visible" {TMPL_IF NAME="visible"}checked{/TMPL_IF}>
-                        Teil ist öffentlich sichtbar
-                    </td>
-                </tr>
---!>            <tr>
+                <tr>
                     <td valign="top">
                         <b>Kommentar:</b>
                     </td>

diff --git a/templates/standard/show_part_info.php/vlib_show_part_info.tmpl b/templates/standard/show_part_info.php/vlib_show_part_info.tmpl
@@ -49,11 +49,7 @@
                                </td>
                            </tr>
                        {/TMPL_UNLESS}
-<!--                   <tr>
-TODO:                      <td><b>Öffentlich sichtbar:</b></td>
-remove this                <td>{TMPL_IF NAME="visible"}ja{TMPL_ELSE}nein{/TMPL_IF}</td>
-                       </tr>
---!>                   <tr>
+                       <tr>
                            <td valign="top"><b>Kommentar:</b></td>
                            <td>{TMPL_IF NAME="comment"}{TMPL_VAR NAME="comment" ESCAPE="none"}{TMPL_ELSE}-{/TMPL_IF}</td>
                        </tr>

diff --git a/templates/standard/vlib_foot.tmpl b/templates/standard/vlib_foot.tmpl
@@ -20,6 +20,6 @@
     </div>
 {/TMPL_IF}
 
-{TMPL_UNLESS NAME="no_body"}</body>{/TMPL_UNLESS}
+{TMPL_UNLESS NAME="frameset"}</body>{/TMPL_UNLESS}
 
 </html>
diff --git a/templates/standard/vlib_head.tmpl b/templates/standard/vlib_head.tmpl
@@ -1,4 +1,8 @@
+{TMPL_IF NAME="frameset"}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+{TMPL_ELSE}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+{/TMPL_IF}
 <html>
 <head>
     {TMPL_IF NAME="page_title"} <title>{TMPL_VAR NAME="page_title"}</title>{/TMPL_IF}
@@ -20,7 +24,7 @@
     <base target="_self">
 </head>
 
-{TMPL_UNLESS NAME="no_body"}
+{TMPL_UNLESS NAME="frameset"}
 
     <body class="body" onload="{TMPL_VAR NAME="body_onload"}">