Branch: Tag:

1997-10-16

1997-10-16 12:16:34 by Per Hedbor <ph@opera.com>

Fixed a lot of layout things, and added a new tag

Rev: server/base_server/mainconfig.pike:1.81
Rev: server/base_server/wizard.pike:1.38
Rev: server/etc/modules/PDB.pmod:1.15
Rev: server/modules/graphics/graphic_text.pike:1.88
Rev: server/modules/graphics/pimage.pike:1.5
Rev: server/modules/proxies/connect.pike:1.11
Rev: server/roxen-images/roxen-icon-gray.gif:1.3
Rev: server/roxen-images/urtavla.ppm:1.3

1: - /* $Id: wizard.pike,v 1.37 1997/09/03 05:19:28 per Exp $ + /* $Id: wizard.pike,v 1.38 1997/10/16 12:16:26 per Exp $    * name="Wizard generator";    * doc="This plugin generats all the nice wizards";    */
301:   }      mapping wizards = ([]); -  + string err;   object get_wizard(string act, string dir, mixed ... args)   {    act-="/"; -  +  // _master->set_inhibit_compile_errors(""); +  // catch {    if(!wizards[dir+act]) wizards[dir+act]=compile_file(dir+act)(@args); -  +  // }; +  if(_master->errrors && strlen(_master->errors)) err+=_master->errors; +  // _master->set_inhibit_compile_errors(0); +  // if(!wizards[dir+act]) throw("Failed to compile "+act+"\n");    return wizards[dir+act];   }   
330:    name+"</a></font><dd>"+(get_wizard(act,dir,@args)->doc||"")});    }    }; - // if(err) report_error(describe_backtrace(err)); +  if(err) report_error(describe_backtrace(err));    }    return acts;   }
360:       if(!id->variables->action)    { +  catch {    mapping acts = get_actions(base, dir, args); -  return ("<table cellpadding=10><tr><td valign=top bgcolor=#eeeeee>"+ +  string res; +  res= ("<table cellpadding=3><tr><td valign=top bgcolor=#eeeeee>"+    act_describe_submenues(indices(acts),base,id->variables->sm)+    "</td>\n\n<td valign=top>"+    (sizeof(acts)>1 && acts[id->variables->sm]?"<font size=+3>"+    (id->variables->sm||"Misc")+"</font><dl>":"<dl>")+    (sort(acts[id->variables->sm]||({}))*"\n")+ -  "</dl></td></tr></table>"); +  "</dl></td></tr></table>"+ +  (strlen(err)?"<pre>"+err+"</pre>":"")); +  err=""; +  return res; +  }; +  if(strlen(err)) { +  string res="<pre>"+err+"</pre>"; +  err=""; +  return res;    } -  return get_wizard(id->variables->action,dir)->wizard_for(id,base,@args); +     } -  +  object o = get_wizard(id->variables->action,dir); +  if(!o) { +  mixed res = "<pre>"+err+"</pre>"; +  err=""; +  return res; +  } +  mixed res= o->wizard_for(id,base,@args); +  err=""; +  return res; + }      /*** Additional Action Functions ***/