Changeset 1048


Ignore:
Timestamp:
2000-03-31T15:04:32+12:00 (23 years ago)
Author:
nzdl
Message:

tidied up some of the browsing code - replaced DocumentImages,
DocumentTitles and DocumentHeading with DocumentIcon

Location:
trunk/gsdl/src/recpt
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/src/recpt/browsetools.cpp

    r979 r1048  
    2929/*
    3030   $Log$
     31   Revision 1.40  2000/03/31 03:04:30  nzdl
     32   tidied up some of the browsing code - replaced DocumentImages,
     33   DocumentTitles and DocumentHeading with DocumentIcon
     34
    3135   Revision 1.39  2000/02/25 02:28:43  sjboddie
    3236   caught up with assoc directory changes for displaying cover images
     
    258262
    259263  format_t *formatlistptr = new format_t();
    260   parse_formatstring (formatinfo.DocumentHeading, formatlistptr, metadata, getParents);
     264  parse_formatstring (formatinfo.DocumentIcon, formatlistptr, metadata, getParents);
    261265
    262266  if (!get_info (args["d"], args["c"], metadata, getParents, collectproto, response, logout))
     
    665669  // if we're inside a book
    666670  if ((!fulltoc) && (!args["d"].empty())) {
    667     textout << "<p><table cellpadding=0 cellspacing=0><tr>\n";
    668     textout << "<td valign=top";
     671    textout << outconvert << disp
     672        << "<p><center><table width=_pagewidth_><tr>\n"
     673        << "<td valign=top";
    669674    if (formatinfo.DocumentContents) textout << " width=200>\n";
    670675    else textout << " width=100%>\n";
    671     if (formatinfo.DocumentImages)
     676    if (formatinfo.DocumentIcon == "true")
    672677      output_cover_image (args, collectproto, disp, outconvert, textout, logout);
    673     else if (formatinfo.DocumentTitles)
     678    else if (formatinfo.DocumentIcon != "false")
    674679      output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
    675680    output_controls (args, formatinfo.DocumentButtons, collectproto, disp,
     
    693698  }
    694699
    695   if (havecontrols) textout << "</td></tr></table>\n";
    696 }
    697 
    698 
    699 
     700  if (havecontrols) textout << "</td></tr></table></center>\n";
     701}
     702
     703
     704
  • trunk/gsdl/src/recpt/documentaction.cpp

    r928 r1048  
    2828/*
    2929   $Log$
     30   Revision 1.35  2000/03/31 03:04:31  nzdl
     31   tidied up some of the browsing code - replaced DocumentImages,
     32   DocumentTitles and DocumentHeading with DocumentIcon
     33
    3034   Revision 1.34  2000/02/15 22:53:49  kjm18
    3135   search history stuff added.
     
    604608
    605609  while (format_here != format_end) {
    606     if (((*format_here).first == "DocumentImages") &&
    607     ((*format_here).second == "true"))
    608       formatinfo.DocumentImages = true;
    609     else if (((*format_here).first == "DocumentTitles") &&
    610          ((*format_here).second == "false"))
    611       formatinfo.DocumentTitles = false;
    612     else if ((*format_here).first == "DocumentHeading")
    613       formatinfo.DocumentHeading = (*format_here).second;
     610    if ((*format_here).first == "DocumentIcon")
     611      formatinfo.DocumentIcon = (*format_here).second;
    614612    else if (((*format_here).first == "DocumentContents") &&
    615613         ((*format_here).second == "false"))
  • trunk/gsdl/src/recpt/formattools.cpp

    r874 r1048  
    2828/*
    2929   $Log$
     30   Revision 1.18  2000/03/31 03:04:31  nzdl
     31   tidied up some of the browsing code - replaced DocumentImages,
     32   DocumentTitles and DocumentHeading with DocumentIcon
     33
    3034   Revision 1.17  2000/01/26 20:10:31  sjboddie
    3135   changed the default order of detach/expand/highlight buttons
     
    124128
    125129void formatinfo_t::clear() {
    126   DocumentImages = false;
    127   DocumentTitles = true;
    128   DocumentHeading = "{Or}{[parent(Top):Title],[Title],untitled}<br>";
     130  DocumentIcon = "{Or}{[parent(Top):Title],[Title],untitled}<br>";
    129131  DocumentContents = true;
    130132  DocumentArrowsBottom = true;
  • trunk/gsdl/src/recpt/formattools.h

    r868 r1048  
    7676  formatinfo_t () {clear();}
    7777
    78   bool DocumentImages;
    79   bool DocumentTitles;
    80   text_t DocumentHeading;
     78  text_t DocumentIcon;
    8179  bool DocumentContents;
    8280  bool DocumentArrowsBottom;
  • trunk/gsdl/src/recpt/pagedbrowserclass.cpp

    r943 r1048  
    2828/*
    2929   $Log$
     30   Revision 1.9  2000/03/31 03:04:32  nzdl
     31   tidied up some of the browsing code - replaced DocumentImages,
     32   DocumentTitles and DocumentHeading with DocumentIcon
     33
    3034   Revision 1.8  2000/02/17 20:54:00  sjboddie
    3135   minor change to macro name
     
    141145
    142146  // must be at top level to get to here!
    143   textout << outconvert << disp << "<table><tr valign=top><td colspan=3><center><b>"
    144       << section.metadata["Title"].values[0] << "_document:textintro_</b>\n";
     147  textout << outconvert << disp << "<b>" << section.metadata["Title"].values[0]
     148      << "_document:textintro_</b>\n";
    145149 
    146150  return 0;
  • trunk/gsdl/src/recpt/vlistbrowserclass.cpp

    r934 r1048  
    2828/*
    2929   $Log$
     30   Revision 1.8  2000/03/31 03:04:32  nzdl
     31   tidied up some of the browsing code - replaced DocumentImages,
     32   DocumentTitles and DocumentHeading with DocumentIcon
     33
    3034   Revision 1.7  2000/02/17 02:33:09  sjboddie
    3135   minor tidy up - made some function definitions virtual
     
    100104
    101105  if (use_table || colnumber > 0) {
    102     textout << "<table><tr>";
     106    textout << "<table><tr valign=top>";
    103107    // get tab size
    104108    text_t tab; int itab;
     
    134138
    135139  if (colnumber > 0) {
    136     textout << "<table><tr>";
     140    textout << "<table><tr valign=top>";
    137141    // get tab size
    138142    text_t tab; int itab;
     
    158162      if (arg_cl == (*thissection).OID) highlight = true;
    159163
    160     if (use_table || colnumber > 0) textout << "<tr>";
     164    if (use_table || colnumber > 0) textout << "<tr valign=top>";
    161165    textout << outconvert << disp << get_formatted_string (*thissection, formatlistptr,
    162166                               link, icon, highlight);
Note: See TracChangeset for help on using the changeset viewer.