Changeset caad58d25a636bbf09328056131c2a316327d423

Timestamp:

04/01/07 10:57:42 (2 years ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1175417862 +0200

git-parent:

[a2ac3f915e9adaed428bbabbcd6bca0ba5f5a467]

git-author:

Christopher Jung <bktheg@web.de> 1175417862 +0200

Message:

Zeilenumbruchshack entfernt (mal schauen ob der IE da mitmacht)

Files:

• src/net/driftingsouls/ds2/server/modules/BaseController.java (modified) (3 diffs)
• templates/base.html (modified) (2 diffs)

src/net/driftingsouls/ds2/server/modules/BaseController.java

@@ -464 +464 @@
-                t.set_block("_BASE", "base.estat.listitem", "base.estat.list");
-                
-                // Dieses dumme Konstrukt braucht der IE
-                int breakafter =(base.getWidth()*39+20+500)/16;
-                
-                int i = 0;
-
-                t.set_var("estat.image", baseimg+"_x.gif");
-                for( ;e_x > 0; e_x-- ) {
-                        if( i == 0 ) {
-                                t.set_var("estat.break", 0);
-                        }
-                        i++;
-                        if( i > breakafter ) {
-                                t.set_var("estat.break", 1);
-                                i = 0;  
-                        }
-                        t.parse("base.estat.list", "base.estat.listitem", true);
-                }
@@ -484 +471 @@
-                t.set_var("estat.image", baseimg+"_v.gif");
-                for( ;e_v > 0; e_v-- ) {
-                        if( i == 0 ) {
-                                t.set_var("estat.break", 0);
-                        }
-                        i++;
-                        if( i > breakafter ) {
-                                t.set_var("estat.break", 1);
-                                i = 0;  
-                        }
-                        t.parse("base.estat.list", "base.estat.listitem", true);
-                }
-                t.set_var("estat.image", baseimg+".gif");
-                for( ;e > 0; e-- ) {
-                        if( i == 0 ) {
-                                t.set_var("estat.break", 0);
-                        }
-                        i++;
-                        if( i > breakafter ) {
-                                t.set_var("estat.break", 1);
-                                i = 0;  
-                        }
-                        t.parse("base.estat.list", "base.estat.listitem", true);
-                }
-                
-                i = 0;
-                breakafter =(base.getWidth()*39+20+500)/8;
-                Map<Integer,String> bevstats = new LinkedHashMap<Integer,String>();
-
@@ -529 +498 @@
-                        t.set_var("bev.image", image);
-                        for( ;bevstat > 0; bevstat-- ) {
-                                if( i == 0 ) {
-                                        t.set_var("bev.break", 0);
-                                }
-                                i++;
-                                if( i > breakafter ) {
-                                        t.set_var("bev.break", 1);
-                                        i = 0;  
-                                }
-                                t.parse("base.bev.list", "base.bev.listitem", true);
-                        }

templates/base.html

@@ -58 +58 @@
-<table class="noBorder" cellspacing="5" cellpadding="2">
-<tr>
-
+style="width:{base.map.width}px" 
-        <td style="width:5px" class="noBorder"></td>
-        <td style="width:280px" class="Border">Cargo</td>
@@ -154 +154 @@
-                        Aktuelle Energie: {base.e}<br />
-                        Bilanz: {base.estat} 
-{if estat.break}<br />{/endif}
+
-                        <br />
-                        Bev&ouml;lkerung: {base.bewohner}<br />
-                        Arbeiter ben&ouml;tigt: {base.arbeiter.needed}<br />
-                        Wohnraum: {base.wohnraum}<br />
-{if bev.break}<br />{/endif}
+
-                        <br /><br />
-                {!table_end}