Fossil SCM
CSS fixes - make <div class="content"> ... </div> actually enclose the content. Also add a couple of missing footers.
Commit
23ed5e2cd6e89a22c922d9f6ac6f9627d9d442bd
Parent
924554d78b4d68a…
2 files changed
+2
+4
-4
+2
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -683,10 +683,11 @@ | ||
| 683 | 683 | @ <hr> |
| 684 | 684 | @ Here is the default page header: |
| 685 | 685 | @ <blockquote><pre> |
| 686 | 686 | @ %h(zDefaultHeader) |
| 687 | 687 | @ </pre></blockquote> |
| 688 | + style_footer(); | |
| 688 | 689 | db_end_transaction(0); |
| 689 | 690 | } |
| 690 | 691 | |
| 691 | 692 | /* |
| 692 | 693 | ** WEBPAGE: setup_footer |
| @@ -715,7 +716,8 @@ | ||
| 715 | 716 | @ <hr> |
| 716 | 717 | @ Here is the default page footer: |
| 717 | 718 | @ <blockquote><pre> |
| 718 | 719 | @ %h(zDefaultFooter) |
| 719 | 720 | @ </pre></blockquote> |
| 721 | + style_footer(); | |
| 720 | 722 | db_end_transaction(0); |
| 721 | 723 | } |
| 722 | 724 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -683,10 +683,11 @@ | |
| 683 | @ <hr> |
| 684 | @ Here is the default page header: |
| 685 | @ <blockquote><pre> |
| 686 | @ %h(zDefaultHeader) |
| 687 | @ </pre></blockquote> |
| 688 | db_end_transaction(0); |
| 689 | } |
| 690 | |
| 691 | /* |
| 692 | ** WEBPAGE: setup_footer |
| @@ -715,7 +716,8 @@ | |
| 715 | @ <hr> |
| 716 | @ Here is the default page footer: |
| 717 | @ <blockquote><pre> |
| 718 | @ %h(zDefaultFooter) |
| 719 | @ </pre></blockquote> |
| 720 | db_end_transaction(0); |
| 721 | } |
| 722 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -683,10 +683,11 @@ | |
| 683 | @ <hr> |
| 684 | @ Here is the default page header: |
| 685 | @ <blockquote><pre> |
| 686 | @ %h(zDefaultHeader) |
| 687 | @ </pre></blockquote> |
| 688 | style_footer(); |
| 689 | db_end_transaction(0); |
| 690 | } |
| 691 | |
| 692 | /* |
| 693 | ** WEBPAGE: setup_footer |
| @@ -715,7 +716,8 @@ | |
| 716 | @ <hr> |
| 717 | @ Here is the default page footer: |
| 718 | @ <blockquote><pre> |
| 719 | @ %h(zDefaultFooter) |
| 720 | @ </pre></blockquote> |
| 721 | style_footer(); |
| 722 | db_end_transaction(0); |
| 723 | } |
| 724 |
+4
-4
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -119,13 +119,13 @@ | ||
| 119 | 119 | |
| 120 | 120 | /* Go back and put the submenu at the top of the page. We delay the |
| 121 | 121 | ** creation of the submenu until the end so that we can add elements |
| 122 | 122 | ** to the submenu while generating page text. |
| 123 | 123 | */ |
| 124 | + cgi_destination(CGI_HEADER); | |
| 124 | 125 | if( nSubmenu>0 ){ |
| 125 | 126 | int i; |
| 126 | - cgi_destination(CGI_HEADER); | |
| 127 | 127 | @ <div class="submenu"> |
| 128 | 128 | qsort(aSubmenu, nSubmenu, sizeof(aSubmenu[0]), submenuCompare); |
| 129 | 129 | for(i=0; i<nSubmenu; i++){ |
| 130 | 130 | struct Submenu *p = &aSubmenu[i]; |
| 131 | 131 | if( p->zLink==0 ){ |
| @@ -133,18 +133,18 @@ | ||
| 133 | 133 | }else{ |
| 134 | 134 | @ <a class="label" href="%s(p->zLink)">%h(p->zLabel)</a> |
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | @ </div> |
| 138 | - cgi_destination(CGI_BODY); | |
| 139 | 138 | } |
| 139 | + @ <div class="content"> | |
| 140 | + cgi_destination(CGI_BODY); | |
| 140 | 141 | |
| 141 | 142 | /* Put the footer at the bottom of the page. |
| 142 | 143 | */ |
| 143 | - @ <div class="content"> | |
| 144 | - zFooter = db_get("footer", (char*)zDefaultFooter); | |
| 145 | 144 | @ </div> |
| 145 | + zFooter = db_get("footer", (char*)zDefaultFooter); | |
| 146 | 146 | Th_Render(zFooter); |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /* @-comment: // */ |
| 150 | 150 | /* |
| 151 | 151 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -119,13 +119,13 @@ | |
| 119 | |
| 120 | /* Go back and put the submenu at the top of the page. We delay the |
| 121 | ** creation of the submenu until the end so that we can add elements |
| 122 | ** to the submenu while generating page text. |
| 123 | */ |
| 124 | if( nSubmenu>0 ){ |
| 125 | int i; |
| 126 | cgi_destination(CGI_HEADER); |
| 127 | @ <div class="submenu"> |
| 128 | qsort(aSubmenu, nSubmenu, sizeof(aSubmenu[0]), submenuCompare); |
| 129 | for(i=0; i<nSubmenu; i++){ |
| 130 | struct Submenu *p = &aSubmenu[i]; |
| 131 | if( p->zLink==0 ){ |
| @@ -133,18 +133,18 @@ | |
| 133 | }else{ |
| 134 | @ <a class="label" href="%s(p->zLink)">%h(p->zLabel)</a> |
| 135 | } |
| 136 | } |
| 137 | @ </div> |
| 138 | cgi_destination(CGI_BODY); |
| 139 | } |
| 140 | |
| 141 | /* Put the footer at the bottom of the page. |
| 142 | */ |
| 143 | @ <div class="content"> |
| 144 | zFooter = db_get("footer", (char*)zDefaultFooter); |
| 145 | @ </div> |
| 146 | Th_Render(zFooter); |
| 147 | } |
| 148 | |
| 149 | /* @-comment: // */ |
| 150 | /* |
| 151 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -119,13 +119,13 @@ | |
| 119 | |
| 120 | /* Go back and put the submenu at the top of the page. We delay the |
| 121 | ** creation of the submenu until the end so that we can add elements |
| 122 | ** to the submenu while generating page text. |
| 123 | */ |
| 124 | cgi_destination(CGI_HEADER); |
| 125 | if( nSubmenu>0 ){ |
| 126 | int i; |
| 127 | @ <div class="submenu"> |
| 128 | qsort(aSubmenu, nSubmenu, sizeof(aSubmenu[0]), submenuCompare); |
| 129 | for(i=0; i<nSubmenu; i++){ |
| 130 | struct Submenu *p = &aSubmenu[i]; |
| 131 | if( p->zLink==0 ){ |
| @@ -133,18 +133,18 @@ | |
| 133 | }else{ |
| 134 | @ <a class="label" href="%s(p->zLink)">%h(p->zLabel)</a> |
| 135 | } |
| 136 | } |
| 137 | @ </div> |
| 138 | } |
| 139 | @ <div class="content"> |
| 140 | cgi_destination(CGI_BODY); |
| 141 | |
| 142 | /* Put the footer at the bottom of the page. |
| 143 | */ |
| 144 | @ </div> |
| 145 | zFooter = db_get("footer", (char*)zDefaultFooter); |
| 146 | Th_Render(zFooter); |
| 147 | } |
| 148 | |
| 149 | /* @-comment: // */ |
| 150 | /* |
| 151 |