Skip to content

Commit

Permalink
more css hackery
Browse files Browse the repository at this point in the history
git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@788 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information
Claes Wikstrom committed Dec 2, 2004
1 parent cd63bee commit 20ece13
Show file tree
Hide file tree
Showing 25 changed files with 64 additions and 49 deletions.
Binary file modified doc/yaws.pdf
Binary file not shown.
6 changes: 4 additions & 2 deletions src/yaws_server.erl
Original file line number Diff line number Diff line change
Expand Up @@ -2022,7 +2022,8 @@ expand_parts([{var, V} |T] , Bs, Ack) ->
{value, {_, Val}} ->
expand_parts(T, Bs, [Val|Ack]);
false ->
{error, ?F("No variable binding found for ~p", [V])}
expand_parts(T, Bs, Ack)
%%{error, ?F("No variable binding found for ~p", [V])}
end;
expand_parts([], _,Ack) ->
lists:reverse(Ack).
Expand Down Expand Up @@ -2714,6 +2715,7 @@ check_comps([Pair |Tail], Comps) ->
split_at(_, [], _Ack) ->
false;
split_at(AM={PE, _Mod}, [PEslash|Tail], Ack) ->
?Debug("AM=~p PEslash=~p~n", [AM, PEslash]),
case no_slash_eq(PE, PEslash) of
true ->
{ok, lists:reverse(Ack), AM, Tail};
Expand All @@ -2735,7 +2737,7 @@ no_slash_eq(_,_) ->


maybe_return_dir(DR, GetPath) ->
?Debug("maybe_return_dir(~p, ~p)", [DR, GetPath]),
?Debug("maybe_return_dir(~p, ~p)", [DR, GetPath]),
case prim_file:read_file_info([DR, GetPath, "index.yaws"]) of
{ok, FI} when FI#file_info.type == regular ->
do_url_type(get(sc), GetPath ++ "index.yaws");
Expand Down
4 changes: 3 additions & 1 deletion www/END2
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

<div"class="logo"
<IMG SRC="/icons/yaws_pb.gif" >
</div

</body>
</html>
49 changes: 25 additions & 24 deletions www/TAB.inc
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,38 @@



<div class="logo"
<img src="icons/yaws_head.gif" width="600" alt="YAWS">
</div>

<img src="icons/yaws_head.gif" width="600" alt="YAWS">


<div id="sidebar">
<h4> Yaws </h4>
<a href="index.yaws" id="index" >Top Page</a>
<a href="configuration.yaws" id="configuration">Build Config & Run</a>
<a href="dynamic.yaws" id="dynamic" >Dynamic content</a>
<a href="contribs.yaws" id="contribs">Contribs/Apps</a>
<a href="download" id="download">Download </a>
<a href="contact.yaws" id="contact">Contact </a>
<a href="doc.yaws" id="doc">Documentation</a>
<div class="%%index%%" <a href="index.yaws" id="index" >Top Page</a> </div>
<div class="%%configuration%%" <a href="configuration.yaws" id="configuration">Build Config & Run</a></div>
<div class="%%dynamic%%" <a href="dynamic.yaws" id="dynamic" >Dynamic content</a> </div>
<div class="%%contribs%%" <a href="contribs.yaws" id="contribs">Contribs/Apps</a> </div>
<div class="%%download%%" <a href="download" id="download">Download </a> </div>
<div class="%%contact%%" <a href="contact.yaws" id="contact">Contact </a> </div>
<div class="%%doc%%" <a href="doc.yaws" id="doc">Documentation</a> </div>
<h4> Examples </h4>
<a href="/simple.yaws">Simple</a>
<a href="/dynamic.yaws">Dynamic content</a>
<a href="/query.yaws">Query part of url</a>
<a href="/form.yaws">Forms</a>
<a href="/redirect.yaws">Redirect</a>
<a href="/arg.yaws">Arg</a>
<a href="/ssi.yaws">Server side includes</a>
<a href="/bindings.yaws">Bindings</a>
<a href="/upload0.yaws">File upload</a>
<a href="/cookies.yaws">Cookies</a>
<a href="/pcookie.yaws">Persistent Cookies</a>
<a href="/session.yaws">Cookie sessions</a>
<a href="/appmods.yaws">Appmods</a>
<a href="/stream.yaws">Streaming data</a>
<div class="%%simple%%" <a href="/simple.yaws">Simple</a> </div>
<div class="%%dynamic%%" <a href="/dynamic.yaws">Dynamic content</a> </div>
<div class="%%query%%" <a href="/query.yaws">Query part of url</a></div>
<div class="%%form%%" <a href="/form.yaws">Forms</a> </div>
<div class="%%redirect%%" <a href="/redirect.yaws">Redirect</a> </div>
<div class="%%arg%%" <a href="/arg.yaws">Arg</a> </div>
<div class="%%ssi%%" <a href="/ssi.yaws">Server side includes</a> </div>
<div class="%%bindings%%" <a href="/bindings.yaws">Bindings</a> </div>
<div class = "%%upload0%%" <a href="/upload0.yaws">File upload</a> </div>
<div class="%%cookies%%" <a href="/cookies.yaws">Cookies</a> </div>
<div class="%%pcookie%%" <a href="/pcookie.yaws">Persistent Cookies</a> </div>
<div class="%%session%%" <a href="/session.yaws">Cookie sessions</a> </div>
<div class="%%appmods%%" <a href="/appmods.yaws">Appmods</a> </div>
<div class="%%stream%%" <a href="/stream.yaws">Streaming data</a> </div>
<a href="/shopingcart/index.yaws">Tiny shopping cart</a>
<a href="/embed.yaws">Embedding Yaws</a>

<div class="%%embed%%" <a href="/embed.yaws">Embedding Yaws</a></div>



Expand Down
2 changes: 1 addition & 1 deletion www/appmods.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ssi(File) ->


out(A) ->
[{ssi, "TAB.inc", [],[]},
[{ssi, "TAB.inc", "%%",[{"appmods", "choosen"}]},
{ehtml,
{'div', [{id, "entry"}],

Expand Down
2 changes: 1 addition & 1 deletion www/arg.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<erl>

out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"arg", "choosen"}]}.

</erl>

Expand Down
2 changes: 1 addition & 1 deletion www/bindings.yaws
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<erl>
out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"bindings", "choosen"}]}.
</erl>


Expand Down
2 changes: 1 addition & 1 deletion www/configuration.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ box(Str) ->


out(A) ->
[{ssi, "TAB.inc", [],[]},
[{ssi, "TAB.inc", "%%",[{"configuration", "choosen"}]},
{ehtml,
[{'div', [{id, "entry"}],
[{h1,[],"Build and install"},
Expand Down
2 changes: 1 addition & 1 deletion www/contact.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<erl>

out(A) ->
{ssi, "TAB.inc",[],[]}.
{ssi, "TAB.inc","%%",[{"contact", "choosen"}]}.

</erl>

Expand Down
2 changes: 1 addition & 1 deletion www/contribs.yaws
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<erl>
out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"contribs", "choosen"}]}.
</erl>


Expand Down
2 changes: 1 addition & 1 deletion www/cookies.yaws
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<erl>
out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"cookies", "choosen"}]}.
</erl>

<div id="entry">
Expand Down
2 changes: 1 addition & 1 deletion www/doc.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<erl>

out(A) ->
{ssi, "TAB.inc",[],[]}.
{ssi, "TAB.inc","%%",[{"doc", "choosen"}]}.
</erl>


Expand Down
2 changes: 1 addition & 1 deletion www/dynamic.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ssi(File) ->
{ssi, File,[],[]}}}.

out(A) ->
[{ssi, "TAB.inc", [],[]},
[{ssi, "TAB.inc", "%%",[{"dynamic", "choosen"}]},
{ehtml,
[{'div', [{id, "entry"}],
[
Expand Down
2 changes: 1 addition & 1 deletion www/embed.yaws
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<erl>
out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"embed", "choosen"}]}.
</erl>


Expand Down
2 changes: 1 addition & 1 deletion www/form.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<erl>

out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"form", "choosen"}]}.

</erl>

Expand Down
2 changes: 1 addition & 1 deletion www/index.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


out(A) ->
[{ssi, "TAB.inc",[],[]},
[{ssi, "TAB.inc","%%",[{"index", "choosen"}]},
{ehtml,
[{'div', [{id, "entry"}],
[{h1,[],"Yaws"},
Expand Down
2 changes: 1 addition & 1 deletion www/pcookie.yaws
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<erl>
out(A) -> {ssi, "TAB.inc", [],[]}.
out(A) -> {ssi, "TAB.inc", "%%",[{"pcookie", "choosen"}]}.
</erl>


Expand Down
2 changes: 1 addition & 1 deletion www/query.yaws
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<erl>

out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"query", "choosen"}]}.


</erl>
Expand Down
2 changes: 1 addition & 1 deletion www/redirect.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<erl>

out(A) ->
{ssi, "TAB.inc",[],[]}.
{ssi, "TAB.inc","%%",[{"redirect", "choosen"}]}.

</erl>

Expand Down
2 changes: 1 addition & 1 deletion www/session.yaws
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<erl>
out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"session", "choosen"}]}.
</erl>

<div id="entry">
Expand Down
2 changes: 1 addition & 1 deletion www/simple.yaws
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<erl>

out(A) ->
{ssi, "TAB.inc", [],[]}.
{ssi, "TAB.inc", "%%",[{"simple", "choosen"}]}.
</erl>

<div id="entry">
Expand Down
4 changes: 2 additions & 2 deletions www/ssi.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ssi(File) ->


out(A) ->
[{ssi, "TAB.inc", [],[]},
[{ssi, "TAB.inc", "%%",[{"ssi", "choosen"}]},
{ehtml,
{'div', [{id, "entry"}],
[
Expand Down Expand Up @@ -68,7 +68,7 @@ out(A) ->
" javascript as well as dynamically generated java applets."},

{p, [], "In the above example, \"a\" can be seen as the Variable "
"name whereas \"Godzilla\" can be vievwe upon as the value "
"name whereas \"Godzilla\" can be vieved upon as the value "
"of variable \"a\". It is also possible to have the variable "
" value be a complete ehtml structure, not just plain ascii "
"strings. Here is an example"},
Expand Down
12 changes: 11 additions & 1 deletion www/stil.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@ h5 {font-size: 100%; margin: 0; padding: 0.33em 0 0;

p {line-height: 1.66; margin: 0.5em 0 1em 3em;}


div.logo {margin: 3em;}


div#entry {margin: 0 33% 1em 7%; padding: 0;}

div#sidebar {position: absolute; top: 4em; right: 0; width: 20%; font-size: 11px;}

div#sidebar a {display: block; padding: 8px 0 2px 10px; margin: 0;
border-left: 1px solid rgb(50%,50%,35%);}

div#sidebar a:hover {background: rgb(85%,85%,70%);}
div#sidebar a:hover {background: rgb(221,221,221);}

div.links {
background: green;
Expand All @@ -48,6 +52,12 @@ div.man { border: solid; border-width: thin; width: 100%;
background: rgb(211,211,211) }


div.choosen {border: solid; border-width: thin;
background: rgb(231, 231, 231) }

div.none { }



I { font-size : 12px;
font-family: Times, Verdana, Arial, Helvetica, sans-serif;}
Expand Down
2 changes: 1 addition & 1 deletion www/stream.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ssi(File) ->


out(A) ->
[{ssi, "TAB.inc", [],[]},
[{ssi, "TAB.inc", "%%",[{"stream", "choosen"}]},
{ehtml,
{'div',[{id, "entry"}],
[{h1, [], "Streaming data to the client"},
Expand Down
2 changes: 1 addition & 1 deletion www/upload0.yaws
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<erl>

out(A) ->
[{ssi, "TAB.inc", [],[]},
[{ssi, "TAB.inc", "%%",[{"upload0", "choosen"}]},
{ehtml,
{html, [],
{'div',[{id, "entry"}],
Expand Down

0 comments on commit 20ece13

Please sign in to comment.