diff --git a/iData/iDataHandler.icl b/iData/iDataHandler.icl index b06d66d9379f39abcd00ed98901e8639ea1c62d1..49ec8e7a925ff238e26f23565a3b306aa93d7681 100644 --- a/iData/iDataHandler.icl +++ b/iData/iDataHandler.icl @@ -78,20 +78,6 @@ StartAjax userpage world where defaultpage _ world = ([], initAjaxPage,world) -initAjaxPage = "" +++ - "" +++ - "" +++ // clean styles now code in sepparate style sheet - "" +++ // script for handling ajax code - "" +++ - "" +++ - "
" +++ ThisExe +++ "
" +++ - "
" +++ - "
" +++ - "
" +++ - IF_ClientServer "" - "" +++ - "" - doHtmlClient :: !*World !UserPage !String -> String doHtmlClient world userpage args # (toServer,inout,world) = doHtmlPage (Just (makeArguments args)) userpage [|] world @@ -176,9 +162,25 @@ where AjaxCombine [] debug = abort "AjaxCombine cannot combine empty result" extra_body_attr = [Batt_background (ThisExe +++ "/back35.jpg"),`Batt_Std [CleanStyle]] - extra_style = Hd_Style [] CleanStyles + extra_style = if StyleSheetIntern internal_css external_ccs debugInput = if TraceInput (traceHtmlInput args) EmptyBody + internal_css = Hd_Style [] InternalCleanStyles + external_ccs = Hd_Link [Lka_Type "text/css", Lka_Rel Docr_Stylesheet, Lka_Href ExternalCleanStyles] + +initAjaxPage = "" +++ + "" +++ + "" +++ // clean styles now code in sepparate style sheet + "" +++ // script for handling ajax code + "" +++ + "" +++ + "
" +++ ThisExe +++ "
" +++ + "
" +++ + "
" +++ + "
" +++ + IF_ClientServer "" + "" +++ + "" mkHSt :: *FormStates *NWorld -> *HSt mkHSt states nworld = {cntr=0, states=states, world=nworld, submits = False } diff --git a/iData/iDataSettings.dcl b/iData/iDataSettings.dcl index b27ff7ea31c3d75942933923ee3e534c7f56cfd4..ec8f9dd40a5f381b77e35b99c8f267e50c6d50ba 100644 --- a/iData/iDataSettings.dcl +++ b/iData/iDataSettings.dcl @@ -23,11 +23,11 @@ IF_Database db no_db :== no_db // otherwise, BUT also manually flag of ", gerd //IF_DataFile df no_df :== df // If DataFile option is used IF_DataFile df no_df :== no_df // otherwise, BUT also manually flag of ", read {|*|}, write {|*|}" in the iSpecialStore class definition above -IF_Ajax aj no_aj :== aj // If you want to enable sub-page (thread) handling using "Ajax" technology -//IF_Ajax aj no_aj :== no_aj // Otherwise +//IF_Ajax aj no_aj :== aj // If you want to enable sub-page (thread) handling using "Ajax" technology +IF_Ajax aj no_aj :== no_aj // Otherwise -IF_ClientServer cs no_cs :== cs // If you want to have a client server architecture (with Sapl running on the client) -//IF_ClientServer cs no_cs :== no_cs // Otherwise +//IF_ClientServer cs no_cs :== cs // If you want to have a client server architecture (with Sapl running on the client) +IF_ClientServer cs no_cs :== no_cs // Otherwise //IF_Client cl no_cl :== cl // If you want to generatecode for the Client (Sapl); IF_ClientServer should be set as well// IF_Client cl no_cl :== no_cl // If you want to generatecode for the Sever ; IF_ClientServer should be set as well @@ -82,7 +82,6 @@ ServerKind :== Internal // Enable this one for developing an iData or iTask a SocketNr :== 80 // Socket you wnat to work on, default = 80 - // Global Settings determining where files are stored ThisExe :: String // name of this executable (without .exe) diff --git a/iData/iDataStylelib.dcl b/iData/iDataStylelib.dcl index a7281485c1605ea3e12dfafac269e140d6f5ff64..d7821525e89cc687335746a7c0d7b5e066a6bf44 100644 --- a/iData/iDataStylelib.dcl +++ b/iData/iDataStylelib.dcl @@ -1,21 +1,34 @@ definition module iDataStylelib -import iDataStyleDef, StdInt +import iDataStyleDef, StdInt, iDataSettings -// predefined styles used internally, may also be used by end-user -// can be redefined if one does not like the styles chosen +// This module controlles the styles being used by iData & iTask applications + +StyleSheetIntern :== True // True, if the internlly defined CleanStyles are being used, otherwise use styles defined externally + +InternalCleanStyles :: [Style] // Internal styles defined in this module +ExternalCleanStyles :== ThisExe +++ "/clean.css" // External styles can be found here + + + +//TableHeaderStyle :: Standard_Attr +TableHeaderStyle :== Std_Class "TableHeader" + +//TableRowStyle :: Standard_Attr +TableRowStyle :== Std_Class "TableRow" + +//CleanStyle :: Standard_Attr +CleanStyle :== Std_Class "CleanStyle" + +//EditBoxStyle :: Standard_Attr +EditBoxStyle :== Std_Class "EditBox" + +//DisplayBoxStyle :: Standard_Attr +DisplayBoxStyle :== Std_Class "DisplayBox" -CleanStyle :: Standard_Attr // for text -EditBoxStyle :: Standard_Attr // for an editable box -DisplayBoxStyle :: Standard_Attr // for a non-editable box -TableHeaderStyle :: Standard_Attr // for table headers -TableRowStyle :: Standard_Attr // for tables // Some related default constants used for the length of input boxes defsize :== 12 // size of inputfield defpixel :== 107 // size in pixels for buttons, pull-down buttons -// definition of clean styles - -CleanStyles :: [Style] diff --git a/iData/iDataStylelib.icl b/iData/iDataStylelib.icl index 59e1d3ec197edf092c11861226fc6b0ae289db40..cbdaf8c32eda9c2b6dedae7185b40c24e579ce67 100644 --- a/iData/iDataStylelib.icl +++ b/iData/iDataStylelib.icl @@ -2,23 +2,8 @@ implementation module iDataStylelib import iDataStyleDef, iDataSettings, StdString -TableHeaderStyle :: Standard_Attr -TableHeaderStyle = Std_Class "TableHeader" - -TableRowStyle :: Standard_Attr -TableRowStyle = Std_Class "TableRow" - -CleanStyle :: Standard_Attr -CleanStyle = Std_Class "CleanStyle" - -EditBoxStyle :: Standard_Attr -EditBoxStyle = Std_Class "EditBox" - -DisplayBoxStyle :: Standard_Attr -DisplayBoxStyle = Std_Class "DisplayBox" - -CleanStyles :: [Style] -CleanStyles +InternalCleanStyles :: [Style] +InternalCleanStyles =: [ Style "CleanStyle" [ BgImage (`Img_URL (ThisExe +++ "/back35.jpg")) , BgColor (`Color (`Colorname Teal)) @@ -33,9 +18,7 @@ CleanStyles , Style "TableHeader" [ FntFamily "Arial, Helvetica, sans-serif" , TxtColor (`HexColor (Hexnum H_F H_E H_D H_B H_1 H_8)) -// , BgColor (`Color (`HexColor (Hexnum H_3 H_2 H_7 H_2 H_9 H_D))) , BgColor (`Color (`Colorname Black)) -// , FntWeight Fwo_Bold , FntWeight Fwo_Normal , FntSize (Fso_Length 18) ]