From 95acecdaace2eb237bee4ac7438774477ac26c1f Mon Sep 17 00:00:00 2001 From: stevetruckstuff Date: Fri, 25 Aug 2006 21:36:14 +0000 Subject: [PATCH] Templates for help section git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11643 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/help.php | 108 +++++++++++------------------ templates/default/help_chapter.tpl | 101 +++++++++++++++++++++++++++ templates/default/help_toc.tpl | 57 +++++++++++++++ templates/default/stylesheet.tpl | 63 +++++++++++++++++ 4 files changed, 262 insertions(+), 67 deletions(-) create mode 100644 templates/default/help_chapter.tpl create mode 100644 templates/default/help_toc.tpl diff --git a/src/help.php b/src/help.php index 2c0798c7..8490961a 100644 --- a/src/help.php +++ b/src/help.php @@ -92,18 +92,8 @@ function get_info($doc, $pos) { /**************[ END HELP FUNCTIONS ]******************/ -echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td','
' . _("Help") .'
', 'center', $color[0] ) - ) , - 'center', '', 'width="95%" cellpadding="1" cellspacing="2" border="0"' ); - do_hook('help_top'); -echo html_tag( 'table', '', 'center', '', 'width="90%" cellpadding="0" cellspacing="10" border="0"' ) . - html_tag( 'tr' ) . - html_tag( 'td' ); - if (!isset($squirrelmail_language)) { $squirrelmail_language = 'en_US'; } @@ -169,25 +159,21 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) { } } - // Write the TOC header - echo html_tag( 'table', '', 'center', '', 'cellpadding="0" cellspacing="0" border="0"' ) . - html_tag( 'tr' ) . - html_tag( 'td' ) . - '
' . _("Table of Contents") . '

'; - echo html_tag( 'ol' ); - - // Write the TOC chapters. - // FIXME: HTML code is not compliant. - for ($i=0, $cnt = count($toc); $i < $cnt; $i++) { - echo '
  • ' . - $toc[$i][1] . '' . html_tag( 'ul', $toc[$i][2] ); - } - // Provide hook for external help scripts. do_hook('help_chapter'); - - // Write the TOC footer. - echo ''; + + $new_toc = array(); + foreach ($toc as $ch) { + $a = array(); + $a['Chapter'] = $ch[0]; + $a['Title'] = $ch[1]; + $a['Summary'] = trim($ch[2]); + $new_toc[] = $a; + } + + $oTemplate->assign('toc', $new_toc); + + $oTemplate->display('help_toc.tpl'); } else { // Initialise the needed variables. $display_chapter = TRUE; @@ -206,61 +192,49 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) { $display_chapter = FALSE; } - // Write the chpater header. - echo '
    '; - if ($chapter <= 1){ - echo '' . _("Previous") - . ' | '; - } else { - echo '' . _("Previous") . ' | '; - } - echo '' . _("Table of Contents") . ''; - if ($chapter >= count($helpdir)){ - echo ' | ' . _("Next") . ''; - } else { - echo ' | ' . _("Next") . ''; - } - echo '

    '; - // Write the chapter. if ($display_chapter) { // If there is a valid chapter, display it. $help_info = get_info($doc, 0); - echo '' . $chapter . ' - ' . $help_info[0] - . '

    '; - - if (isset($help_info[1]) && $help_info[1]) { - echo $help_info[1]; - } else { - echo html_tag( 'p', $help_info[2], 'left' ); - } - + $ch = array(); + $ch['Chapter'] = $chapter; + $ch['Title'] = $help_info[0]; + $ch['Summary'] = isset($help_info[1]) && $help_info[1] ? trim($help_info[1]) : $help_info[2]; + $ch['Sections'] = array(); $section = 0; for ($n = $help_info[3], $cnt = count($doc); $n < $cnt; $n++) { $section++; $help_info = get_info($doc, $n); - echo "$chapter.$section - $help_info[0]" . - $help_info[1]; $n = $help_info[3]; - } - echo '
    ' . _("Top") . '
    '; + $a = array(); + $a['SectionNumber'] = $section; + $a['SectionTitle'] = $help_info[0]; + $a['SectionText'] = isset($help_info[1]) ? trim($help_info[1]) : '';; + + $ch['Sections'][] = $a; + } + + $oTemplate->assign('chapter_number', $chapter); + $oTemplate->assign('chapter_count', count($helpdir)); + $oTemplate->assign('chapter_title', $ch['Title']); + $oTemplate->assign('chapter_summary', $ch['Summary']); + $oTemplate->assign('sections', $ch['Sections']); + $oTemplate->assign('error_msg', NULL); } else { - // If the help file went MIA, display an error message. - error_box(sprintf(_("For some reason, chapter %s is not available."), $chapter)); + // If the help file went MIA, trigger an error message. + $oTemplate->assign('chapter_number', $chapter); + $oTemplate->assign('chapter_count', count($helpdir)); + $oTemplate->assign('chapter_title', ''); + $oTemplate->assign('chapter_summary', ''); + $oTemplate->assign('sections', array()); + $oTemplate->assign('error_msg', sprintf(_("For some reason, chapter %s is not available."), $chapter)); } + + $oTemplate->display('help_chapter.tpl'); } do_hook('help_bottom'); -echo html_tag( 'tr', - html_tag( 'td', ' ', 'left', $color[0] ) - ); - -?> - -display('footer.tpl'); ?> \ No newline at end of file diff --git a/templates/default/help_chapter.tpl b/templates/default/help_chapter.tpl new file mode 100644 index 00000000..93366516 --- /dev/null +++ b/templates/default/help_chapter.tpl @@ -0,0 +1,101 @@ + +
    + + + + + + + + + + + + + + +
    + +
    + + + + + | + + | + + + + +
    + +

    + - +

    +

    + +

    + +

    + . - +

    + + +
    + +
    + \ No newline at end of file diff --git a/templates/default/help_toc.tpl b/templates/default/help_toc.tpl new file mode 100644 index 00000000..5db2be87 --- /dev/null +++ b/templates/default/help_toc.tpl @@ -0,0 +1,57 @@ + +
    + + + + + + + + + + +
    + +
    + +
    +
      + +
    1. + +
      +
      2. + +
    +
    +
    \ No newline at end of file diff --git a/templates/default/stylesheet.tpl b/templates/default/stylesheet.tpl index e54e8ac3..4abb8587 100644 --- a/templates/default/stylesheet.tpl +++ b/templates/default/stylesheet.tpl @@ -157,6 +157,13 @@ td.header2 { padding-bottom: 4px; } +td.header3 { + text-align: center; + font-weight: bold; + padding-top: 4px; + padding-bottom: 4px; +} + tr.even { background: ; } @@ -632,3 +639,59 @@ tr.odd { margin-left: auto; margin-right: auto; } + +/* help defs */ +#help { + text-align: center; +} + +#help td.help { + text-align: ; +} + +#help li { + padding-left: 0px; +} + +#help ul { + padding-left: 20px; + padding-right: 75px; +} + +#help td.nav { + text-align: center; + color: ; + padding-top: 15px; + padding-bottom: 5px; +} + +#help h1 { + font-size: 14pt; + font-weight: bold; + margin-top: 2px; + margin-bottom: 0px; +} + +#help h2 { + font-size: 10pt; + font-weight: normal; + margin-bottom: 2px; + margin-top: 0; +} + +#help h3 { + font-weight: bold; + font-size: 10pt; + margin: 0; + padding: 0; +} + +#help td.help p { + margin-top: 2px; + margin-bottom: 10px; +} + +#help td.help li { + margin-left: 10px; +} + -- 2.25.1