uppbox_full.diff

The diff file to apply for uppbox directory (with all changes) - Sender Ghost, 10/26/2011 09:24 PM

Download (3.96 KB)

View differences:

uppbox/uppweb/init 2011-10-26 18:56:12 +0600
1 1 
#ifndef _uppweb_icpp_init_stub
2 2 
#define _uppweb_icpp_init_stub
3 
#include "Web/init"
3 
#include "ide\Browser/init"
4 4 
#include "RichText/init"
5 5 
#include "plugin\gif/init"
6 
#include "CtrlLib/init"
7 
#include "plugin\png/init"
8 
#include "ide/init"
9 6 
#include "plugin\ftp/init"
10 7 
#include "Sql/init"
11 8 
#include "Skeleton/init"
uppbox/uppweb/uppweb.upp 2011-10-26 18:56:12 +0600
1 1 
description "Ultimate++ website generation and export.\377";
2 2 

  		




  3
  3
  
    
uses


  		




  4
  
  
    
	Web,


  		




  
  4
  
    
	ide\Browser,


  		




  5
  5
  
    
	RichText,


  		




  6
  6
  
    
	plugin\gif,


  		




  7
  
  
    
	CtrlLib,


  		




  8
  
  
    
	CtrlLib,


  		




  9
  
  
    
	plugin\png,


  		




  10
  
  
    
	ide,


  		




  11
  7
  
    
	plugin\ftp,


  		




  12
  
  
    
	Sql,


  		




  13
  
  
    
	Skeleton;


  		




  
  8
  
    
	Sql;


  		




  
  9
  
    

  		




  
  10
  
    
uses(SKELETON) Skeleton;


  		




  14
  11
  
    

  		




  15
  12
  
    
options(GCC) -DNOWSTRING;


  		




  16
  13
  
    

  		












  

    
      uppbox/uppweb/www.cpp	2011-10-27 01:20:36 +0600
    
  





  178
  178
  
    
	String style = "border: 0px solid black; "


  		




  179
  179
  
    
	               "padding-left:6px; padding-right:0px; "


  		




  180
  180
  
    
	               "padding-top:4px; padding-bottom:4px;";


  		




  181
  
  
    
		               "border-top: 1px solid #6E89AE;";


  		




  
  181
  
    
//		               "border-top: 1px solid #6E89AE;";


  		




  182
  182
  
    
	return BarItem(content, style);


  		




  183
  183
  
    
}


  		




  184
  184
  
    

  		




  ......




  187
  187
  
    
	return HtmlPackedTable().Width(-100) /


  		




  188
  188
  
    
		   HtmlLine();


  		




  189
  189
  
    
}


  		




  190
  
  
    

  		




  191
  190
  
    
VectorMap<String, String> escape;


  		




  192
  191
  
    

  		




  193
  192
  
    
String QtfAsHtml(const char *qtf, Index<String>& css,


  		




  ......




  198
  197
  
    
	return EncodeHtml(ParseQTF(qtf), css, links, labels, outdir, fn, Zoom(8, 40), escape, 40);


  		




  199
  198
  
    
}


  		




  200
  199
  
    

  		




  201
  
  
    
#define TOPICFILE <uppweb/www.tpp/all.i>


  		




  202
  
  
    
#include <Core/topic_group.h>


  		




  203
  
  
    

  		




  204
  
  
    
#define TOPICFILE <ide/app.tpp/all.i>


  		




  205
  
  
    
#include <Core/topic_group.h>


  		




  206
  
  
    

  		




  207
  200
  
    
String GetText(const char *s)


  		




  208
  201
  
    
{


  		




  209
  202
  
    
	return GetTopic(s).text;


  		




  ......




  320
  313
  
    
	}


  		




  321
  314
  
    
};


  		




  322
  315
  
    

  		




  
  316
  
    
Topic ReadTopic(const String& nest, const String& package, const String& www, const String& name, int language)


  		




  
  317
  
    
{


  		




  
  318
  
    
	String fn = AppendFileName(


  		




  
  319
  
    
						AppendFileName(


  		




  
  320
  
    
							AppendFileName(nest, package),


  		




  
  321
  
    
							www + ".tpp"


  		




  
  322
  
    
						),


  		




  
  323
  
    
						name + "$" + ToLower(LNGAsText(language))  + ".tpp"


  		




  
  324
  
    
					);


  		




  
  325
  
    

  		




  
  326
  
    
	return ReadTopic(LoadFile(fn));


  		




  
  327
  
    
}


  		




  
  328
  
    

  		




  323
  329
  
    
String MakeExamples(const char *dir, const char *www, int language)


  		




  324
  330
  
    
{


  		




  325
  331
  
    
	String ttxt;


  		




  ......




  338
  344
  
    
		String link = String().Cat() << www << '$' << name << "$" << ToLower(LNGAsText(language)) << ".html";


  		




  339
  345
  
    
		Topic& topic = tt.Add(link);


  		




  340
  346
  
    
		topic.title = name;


  		




  341
  
  
    
		String fn = AppendFileName(


  		




  342
  
  
    
						AppendFileName(


  		




  343
  
  
    
							AppendFileName(uppbox, "uppweb"),


  		




  344
  
  
    
							String(www) + ".tpp"


  		




  345
  
  
    
						),


  		




  346
  
  
    
						topic.title + "$" + ToLower(LNGAsText(language))  + ".tpp"


  		




  347
  
  
    
					);


  		




  348
  
  
    
		String h = ReadTopic(LoadFile(fn)).text;


  		




  
  347
  
    
		String h = ReadTopic(uppbox, "uppweb", www, name, language).text;


  		




  349
  348
  
    
		Package p;


  		




  350
  349
  
    
		p.Load(AppendFileName(AppendFileName(dir, name), name + ".upp"));


  		




  351
  350
  
    
		topic.text << "[R6* " << name << "]&&" << DeQtf(p.description) << "&";


  		




  ......




  766
  765
  
    
		{


  		




  767
  766
  
    
			int di = tt.Find("topic://uppweb/www/examples$" + ToLower(LNGAsText(languages[i])));


  		




  768
  767
  
    
			tt[di].text << MakeExamples(examples, "examples", languages[i]);


  		




  769
  
  
    
			tt[di].text << GetTopic("topic://uppweb/www/reference$" + ToLower(LNGAsText(languages[i]))).text;


  		




  
  768
  
    
			tt[di].text << ReadTopic(uppbox, "uppweb", "www", "reference", languages[i]).text;


  		




  770
  769
  
    
			tt[di].text << MakeExamples(reference, "reference", languages[i]);


  		




  771
  770
  
    
		}


  		




  772
  771
  
    

  		












  

    
      uppbox/uppweb/www.h	2011-10-24 15:17:26 +0600
    
  





  1
  1
  
    
#ifndef _uppweb_www_h_


  		




  2
  2
  
    
#define _uppweb_www_h_


  		




  3
  3
  
    

  		




  4
  
  
    

  		




  5
  
  
    
#include <Web/Web.h>


  		




  
  4
  
    
#include <ide/Browser/Browser.h>


  		




  6
  5
  
    
#include <RichText/RichText.h>


  		




  7
  6
  
    
#include <plugin/gif/gif.h>


  		




  8
  
  
    
#include <CtrlLib/CtrlLib.h>


  		




  9
  
  
    
#include <ide/Browser/Browser.h>


  		




  10
  7
  
    

  		




  11
  8
  
    
using namespace Upp;


  		




  12
  9