projects / Pman.Core / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2f8112f)
templates/master.html
authorAlan Knowles <alan@akbkhome.com>
Fri, 27 Aug 2010 08:27:05 +0000 (16:27 +0800)
committerAlan Knowles <alan@akbkhome.com>
Fri, 27 Aug 2010 08:27:05 +0000 (16:27 +0800)
DataObjects/core.sql patch | blob | history
DataObjects/pman.ini patch | blob | history
templates/master.html [deleted file] patch | blob | history

diff --git a/DataObjects/core.sql b/DataObjects/core.sql
index 5e18046..71d400b 100644 (file)
--- a/DataObjects/core.sql
+++ b/DataObjects/core.sql
@@ -31,6 +31,14 @@ ALTER TABLE `Companies` ADD COLUMN `updated_dt` datetime  NOT NULL;
 
 ALTER TABLE `Companies` ADD COLUMN   `passwd` varchar(64) NOT NULL;
 
+
+ALTER TABLE Companies 
+       ADD COLUMN dispatch_port varchar(255) NOT NULL DEFAULT '',
+       ADD COLUMN province varchar(255) NOT NULL DEFAULT '',,
+       ADD COLUMN country varchar(4) NOT NULL DEFAULT '';
+
+
+
 UPDATE Companies set comptype='OWNER' where isOwner=1;
 
 
diff --git a/DataObjects/pman.ini b/DataObjects/pman.ini
index 78111ff..2f25270 100644 (file)
--- a/DataObjects/pman.ini
+++ b/DataObjects/pman.ini
@@ -25,8 +25,7 @@ passwd = 130
 dispatch_port = 130
 province = 130
 country = 130
-
-
+ 
 
 [Companies__keys]
 id = N
diff --git a/templates/master.html b/templates/master.html
deleted file mode 100644 (file)
index 442a187..0000000
--- a/templates/master.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html 
-      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      xmlns:html="http://www.w3.org/1999/xhtml" 
-      xmlns:svg="http://www.w3.org/2000/svg"
-      xmlns:xlink="http://www.w3.org/1999/xlink"> 
-    <head>
-        <title>{appName}</title>
-        <link rel="shortcut icon" href="./Pman.ico" type="image/vnd.microsoft.icon"/>
-        
-        <link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/cssX/roojs-all.css" />
-        
-        {outputCSSIncludes()}
-        
-                    
-   
-    <style>
-     #loading-logo-bottom,
-     #loading-logo-center,
-     #loading-logo-tile,
-     #loading-logo-tile-top
-     {
-        width:100%;
-        height:100%;
-        position:absolute;
-       
-        left:0;
-        top:0;
-        background-position:50% 50%;
-    }
-    
-    /* background-tile.jpg */
-    #loading-logo-tile {
-         z-index:1000;
-    }
-    
-    /* background.jpg */
-    #loading-logo-center
-    {
-        background-position:50% 0;
-        background-repeat:no-repeat; 
-        z-index:1001;
-    }
-    /* background-tile-top.jpg */
-    #loading-logo-tile-top
-    {
-        background-position:50% 0;
-        z-index:1002;
-        background-repeat:repeat-x; 
-        
-    }
-    /* background_bottom_logo.gif */
-    #loading-logo-bottom
-    {
-        background-position:50% 100%;
-        background-repeat:no-repeat; 
-        z-index:1003;
-    }
-    </style>
-     </head>
-    <body class="ytheme-gray">  
-         <!--background:#F8ECB2;-->   
-        <div flexy:if="hasBg(#background-tile.jpg#)" 
-            id="loading-logo-tile"
-            style="background-image:url({rootURL}/Pman/{appNameShort}/templates/images/background-tile.jpg);"></div>
-        
-        <div flexy:if="hasBg(#background-tile-top.jpg#)"  
-            id="loading-logo-tile-top"
-            style="background-image:url({rootURL}/Pman/{appNameShort}/templates/images/background-tile-top.jpg);"></div>
-        
-        <div flexy:if="hasBg(#background.jpg#)" 
-            id="loading-logo-center"
-            style="background-image:url({rootURL}/Pman/{appNameShort}/templates/images/background.jpg);"></div>
-        
-        <div flexy:if="hasBg(#background_bottom_logo.gif#)" 
-            id="loading-logo-bottom"
-            style="background-image:url({rootURL}/Pman/{appNameShort}/templates/images/background_bottom_logo.gif);"></div>
-        
-        
-        <div id="loading-mask"
-            style="width:1;height:1;position:absolute;z-index:1000;left:0;top:0;">&#160;</div>
-        <div id="loading">
-            <div class="loading-indicator" id="loading-text">&#160;Loading...(This may take a few seconds)</div>
-        </div>
-{if:isDev}                  
-        <script type="text/javascript" src="{rootURL}/roojs1/roojs-debug.js"></script>  
-         
-{else:}                  
-        <script type="text/javascript" src="{rootURL}/roojs1/roojs-all.js"></script>
-                 
-{end:}                  
-        <flexy:toJavascript 
-            baseURL="baseURL" 
-            rootURL="rootURL" 
-            isDev="isDev"
-            serverName="serverName" 
-            appLang="lang"
-            appName="appName"
-            appNameShort="appNameShort"
-            appOwnerCompanyId="company.id"
-             
-            AppLinkError="linkFail"
-            AppTrackOnLoad="onloadTrack"
-            
-            showNewPass="showNewPass"
-            allowSignup="allowSignup"
-            
-            logoPrefix="logoPrefix"
-            
-            AppModules="appModules"
-            AppVersion="appVersion"
-        >
-        
-        <script type="text/javascript">
-            Ext=Roo; // bc
-            Roo.BLANK_IMAGE_URL =  rootURL + "/roojs1/images/gray/s.gif";
-            Roo.rootURL = rootURL +'/roojs1/';
-        </script>
-        
-        {outputJavascriptIncludes()}
-             
-        <!-- used by App.php in Builder - to enable loading of code/applicaiton on the fly -->
-        {foreach:builderJs,js}
-            <script type="text/javascript" src="{baseURL}/Builder/Code/{js}.js"></script>    
-        {end:} 
-           
-        <!-- finally language.. -->   
-        <script type="text/javascript" src="{baseURL}/Core/I18n.js"></script>
-               
-               
-        <script type="text/javascript">
-            Pman.debug = true;
-        </script>
-               
-               
-        <div id="title" class="x-layout-inactive-content logoblock">
-            <img id="headerInformation-company-logo" 
-                src="{rootURL}/Pman/{appNameShort}/templates/images/logo_small.gif" height="25"/>
-            <div id="headerInformation">Some other details</div>
-            <img id="headerInformation-applogo" 
-                src="{rootURL}/Pman/{appNameShort}/templates/images/logo_small.gif" height="25"/>
-            
-        </div>
-         
-          
-           
-        <div id="mainlist" class="x-layout-inactive-content">
-            <p>main list</p>
-                
-        </div>
-          
-    </body>
-</html>
-        
\ No newline at end of file
Pman Core