Skip to content

Commit

Permalink
Merge pull request #786 from andralex/better-menus
Browse files Browse the repository at this point in the history
Better menus for phobos/ and phobos-prerelease as well
  • Loading branch information
WalterBright committed Jan 20, 2015
2 parents 7eba92c + ed99115 commit 82f4348
Show file tree
Hide file tree
Showing 7 changed files with 247 additions and 243 deletions.
1 change: 0 additions & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ body
border: 0;
color: black;
background-color: #1f252b;
background-image: url(../images/gradient-red.jpg);
background-repeat: no-repeat;
font-size: 100%;
font-family: Verdana, "Deja Vu", "Bitstream Vera Sans", sans-serif;
Expand Down
2 changes: 1 addition & 1 deletion dlang.org.ddoc
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ SECTION3=$(H3 $1)$+
SECTION4=$(H4 $1)$+
SECTION5=$(H5 $1)$+
SUBMENU=<ul>$(SUBMENU2 $1,$+)</ul>
SUBMENU2=<li><a href='$1'><span>$2</span></a></li>$(SUBMENU3 $+)
SUBMENU2=<li><a href='$1'>$2</a></li>$(SUBMENU3 $+)
SUBMENU3=$(SUBMENU2 $+)
_=

Expand Down
Binary file removed images/gradient-red.jpg
Binary file not shown.
21 changes: 12 additions & 9 deletions posix.mak
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ endif

# Documents

DDOC=macros.ddoc html.ddoc dlang.org.ddoc doc.ddoc ${LATEST}.ddoc $(NODATETIME)
DDOC=$(addsuffix .ddoc, macros html dlang.org doc ${LATEST}) $(NODATETIME)
STD_DDOC=$(addsuffix .ddoc, macros html dlang.org ${LATEST} std std_navbar-$(LATEST))
STD_DDOC_PRE=$(addsuffix .ddoc, macros html dlang.org ${LATEST} std std_navbar-prerelease)

IMAGES=favicon.ico $(addprefix images/, \
d002.ico \
Expand Down Expand Up @@ -314,18 +316,18 @@ $(DMD_REL) : ${DMD_DIR}-${LATEST}/.cloned
# druntime, latest released build and current build
################################################################################

druntime-prerelease : ${DRUNTIME_DIR}/.cloned ${DOC_OUTPUT_DIR}/phobos-prerelease/object.html
druntime-prerelease : ${DRUNTIME_DIR}/.cloned ${DOC_OUTPUT_DIR}/phobos-prerelease/object.html $(STD_DDOC_PRE)
${DOC_OUTPUT_DIR}/phobos-prerelease/object.html : $(DMD)
${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak -j 4 target doc \
DOCDIR=${DOC_OUTPUT_DIR}/phobos-prerelease \
DOCFMT="`pwd`/html.ddoc `pwd`/dlang.org.ddoc `pwd`/std_navbar-prerelease.ddoc `pwd`/std.ddoc `pwd`/macros.ddoc"
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_PRE))"

druntime-release : ${DRUNTIME_DIR}-${LATEST}/.cloned ${DOC_OUTPUT_DIR}/phobos/object.html
druntime-release : ${DRUNTIME_DIR}-${LATEST}/.cloned ${DOC_OUTPUT_DIR}/phobos/object.html $(STD_DDOC)
${DOC_OUTPUT_DIR}/phobos/object.html : $(DMD_REL)
${MAKE} --directory=${DRUNTIME_DIR}-${LATEST} -f posix.mak target doc \
DMD=$(DMD_REL) \
DOCDIR=${DOC_OUTPUT_DIR}/phobos \
DOCFMT="`pwd`/html.ddoc `pwd`/dlang.org.ddoc `pwd`/std_navbar-$(LATEST).ddoc `pwd`/std.ddoc `pwd`/macros.ddoc" -j 4
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC))"

druntime-prerelease-verbatim : ${DRUNTIME_DIR}/.cloned \
${DOC_OUTPUT_DIR}/phobos-prerelease/object.verbatim
Expand All @@ -342,22 +344,23 @@ ${DOC_OUTPUT_DIR}/phobos-prerelease/object.verbatim : $(DMD)
# phobos, latest released build and current build
################################################################################

.PHONY: phobos-prerelease
phobos-prerelease : ${PHOBOS_DIR}/.cloned ${DOC_OUTPUT_DIR}/phobos-prerelease/index.html
${DOC_OUTPUT_DIR}/phobos-prerelease/index.html : html.ddoc dlang.org.ddoc std.ddoc macros.ddoc \
${DOC_OUTPUT_DIR}/phobos-prerelease/index.html : $(STD_DDOC_PRE) \
${DOC_OUTPUT_DIR}/phobos-prerelease/object.html
${MAKE} --directory=${PHOBOS_DIR} -f posix.mak \
STDDOC="`pwd`/html.ddoc `pwd`/dlang.org.ddoc `pwd`/std_navbar-prerelease.ddoc `pwd`/std.ddoc `pwd`/macros.ddoc" \
STDDOC="$(addprefix `pwd`/, $(STD_DDOC_PRE))" \
DOC_OUTPUT_DIR=${DOC_OUTPUT_DIR}/phobos-prerelease html -j 4

phobos-release : ${PHOBOS_DIR}-${LATEST}/.cloned ${DOC_OUTPUT_DIR}/phobos/index.html
${DOC_OUTPUT_DIR}/phobos/index.html : $(DMD_REL) html.ddoc dlang.org.ddoc std.ddoc macros.ddoc ${LATEST}.ddoc \
${DOC_OUTPUT_DIR}/phobos/index.html : $(DMD_REL) $(STD_DDOC) \
${DOC_OUTPUT_DIR}/phobos/object.html
${MAKE} --directory=${PHOBOS_DIR}-${LATEST} -f posix.mak -j 4 \
html \
DMD=$(DMD_REL) \
DRUNTIME_PATH=${DRUNTIME_DIR}-${LATEST} \
DOC_OUTPUT_DIR=${DOC_OUTPUT_DIR}/phobos \
STDDOC="`pwd`/html.ddoc `pwd`/dlang.org.ddoc `pwd`/$(LATEST).ddoc `pwd`/std_navbar-$(LATEST).ddoc `pwd`/std.ddoc `pwd`/macros.ddoc"
STDDOC="$(addprefix `pwd`/, $(STD_DDOC))"

phobos-prerelease-verbatim : ${PHOBOS_DIR}/.cloned ${DOC_OUTPUT_DIR}/phobos-prerelease/index.verbatim
${DOC_OUTPUT_DIR}/phobos-prerelease/index.verbatim : verbatim.ddoc \
Expand Down
68 changes: 30 additions & 38 deletions std.ddoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,41 @@ DDOC = <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-->
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" >
<title>$(TITLE) - D Programming Language - Digital Mars</title>
<title>$(TITLE) - D Programming Language</title>
<link rel="stylesheet" type="text/css" href="../css/codemirror.css" />
<link rel="stylesheet" type="text/css" href="../css/style.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script>
<script src="/js/codemirror-compressed.js"></script>
<script src="/js/run.js" type="text/javascript"></script>
<script src="../js/listanchors.js" type="text/javascript"></script>
<script type="text/javascript">
jQuery(document).ready(listanchors);
</script>
<link rel="stylesheet" type="text/css" href="../css/cssmenu.css">
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js)
$(SCRIPTLOAD ../js/codemirror-compressed.js)
$(SCRIPTLOAD ../js/run.js)
$(SCRIPTLOAD ../js/listanchors.js)
$(SCRIPTLOAD ../js/cssmenu.js)
$(SCRIPT jQuery(document).ready(listanchors);)
</head>
<body id="$(TITLE)" class='hyphenate'>
$(DIVID top,
<div id="search-box">
$(divid search-box,
<form method="get" action="http://google.com/search">
<img src="/images/search-left.gif" width="11" height="22" alt=""><input id="q" name="q"><input type="image" id="search-submit" name="submit" src="/images/search-button.gif">
<input type="hidden" id="domains" name="domains" value="dlang.org">
<input type="hidden" id="sourceid" name="sourceid" value="google-search">
<div id="search-dropdown">
$(DIVID "search-dropdown,
<select id="sitesearch" name="sitesearch" size="1">
<option value="dlang.org">Entire D Site</option>
<option value="dlang.org/phobos">Library Reference</option>
<option value="www.digitalmars.com/d/archives">Newsgroup Archives</option>
</select>
</div>
)
</form>
</div>
<div id="header">
<a href="/"><img id="logo" width="125" height="95" border="0" alt="D Logo" src="/images/dlogo.png"></a>
<a id="d-language" href="/">D Programming Language</a>
</div>
)
$(DIVID header,
$(A http://dlang.org, <img id="logo" width="125" height="95" border="0" alt="D Logo" src="../images/dlogo.png">)
<a id="d-language" href="http://dlang.org">D Programming Language</a>
)
)
$(DIVID navigation, $(TOP)
$(NAVIGATION_PHOBOS)
)
$(DIVID navigation, $(TOP) $(NAVIGATION_PHOBOS))
$(DIVID content,
$(PAGE_TOOLS)
$(H1 $(TITLE))
Expand All @@ -53,27 +55,17 @@ $(FOOTER)
_=

TOP=
<div class="navblock">
<form method="get" action="http://www.google.com/search">
<div id="searchbox">
<input name="q" size="10" value="RTL Search" onFocus='if(this.value == "RTL Search"){this.value="";}'>
<input type="hidden" name="domains" value="www.digitalmars.com">
<input type="hidden" name="sitesearch" value="dlang.org/phobos">
<input type="hidden" name="sourceid" value="google-search">
<input type="submit" name="submit" value="Go">
</div>
</form>
<div id="toctop">
$(UL
$(LI <a href="../index.html" title="D Programming Language">D</a>)
$(LI <a href="../spec.html" title="D Language Specification">Language</a>)
$(LI <a href="../phobos/index.html" title="D Runtime Library">Phobos $(LATEST)</a>)
$(LI <a href="../phobos-prerelease/index.html" title="D Runtime Library (prerelease)">Phobos (prerelease)</a>)
$(LI <a href="../comparison.html" title="Language Comparisons">Comparisons</a>)
$(LI <a href="http://code.dlang.org" title="Third Party Packages">Third Party Packages</a>)
)
</div>
</div>
$(DIVC navblock,
<form method="get" action="http://www.google.com/search">
$(DIVID searchbox,
<input name="q" size="10" value="RTL Search" onFocus='if(this.value == "RTL Search"){this.value="";}'>
<input type="hidden" name="domains" value="www.digitalmars.com">
<input type="hidden" name="sitesearch" value="dlang.org/phobos">
<input type="hidden" name="sourceid" value="google-search">
<input type="submit" name="submit" value="Go">
)
</form>
)
_=

CXREF = <a href="core_$1.html#$2">$(D core.$1.$2)</a>
Expand Down
191 changes: 98 additions & 93 deletions std_navbar-2.066.1.ddoc
Original file line number Diff line number Diff line change
@@ -1,95 +1,100 @@
LIBITEM=$(LI $(A $1$(LIBITEM_RECURSE1 $+).html, $(D $1$(LIBITEM_RECURSE2 $+))))
LIBITEM_RECURSE1=_$1$(LIBITEM_RECURSE1 $+)
LIBITEM_RECURSE2=.$1$(LIBITEM_RECURSE2 $+)
_=

NAVIGATION_PHOBOS=
<div class="navblock">
$(UL
$(LI <a href="object.html" title="root of object hierarchy">object</a>)
)
$(H2 <a href="index.html#std" title="D standard modules">std</a>)
$(UL
$(LI <a href="std_algorithm.html" title="General-purpose algorithms">std.algorithm</a>)
$(LI <a href="std_array.html" title="Array functions">std.array</a>)
$(LI <a href="std_ascii.html" title="Functions which operate on ASCII characters">std.ascii</a>)
$(LI <a href="std_base64.html" title="Encode/decode base64 format">std.base64</a>)
$(LI <a href="std_bigint.html" title="Arbitrary-precision ('bignum') arithmetic">std.bigint</a>)
$(LI <a href="std_bitmanip.html" title="Bit-level manipulation">std.bitmanip</a>)
$(LI <a href="std_compiler.html" title="Information about the D compiler implementation">std.compiler</a>)
$(LI <a href="std_complex.html" title="Complex numbers">std.complex</a>)
$(LI <a href="std_concurrency.html" title="Message Passing">std.concurrency</a>)
$(LI <a href="std_container.html" title="Containers">std.container</a>)
$(LI <a href="std_conv.html" title="Conversion of strings to integers">std.conv</a>)
$(LI <a href="std_csv.html" title="CSV file parser">std.csv</a>)
$(LI <a href="std_datetime.html" title="Date and time-related types and functions">std.datetime</a>)
$(LI <a href="std_encoding.html" title="Character and string encoding">std.encoding</a>)
$(LI <a href="std_exception.html" title="Exceptions and error handling">std.exception</a>)
$(LI <a href="std_file.html" title="Basic file operations">std.file</a>)
$(LI <a href="std_format.html" title="Formatted conversions of values to strings">std.format</a>)
$(LI <a href="std_functional.html" title="functional">std.functional</a>)
$(LI <a href="std_getopt.html" title="Command line options">std.getopt</a>)
$(LI <a href="std_json.html" title="JSON reader">std.json</a>)
$(LI <a href="std_math.html" title="the usual math functions">std.math</a>)
$(LI <a href="std_mathspecial.html" title="mathematical special functions">std.mathspecial</a>)
$(LI <a href="std_mmfile.html" title="Memory mapped files">std.mmfile</a>)
$(LI <a href="std_numeric.html" title="Numeric algorithms">std.numeric</a>)
$(LI <a href="std_outbuffer.html" title="Assemble data into an array of bytes">std.outbuffer</a>)
$(LI <a href="std_parallelism.html" title="High-level primitives for SMP parallelism">std.parallelism</a>)
$(LI <a href="std_path.html" title="Manipulate file names, path names, etc.">std.path</a>)
$(LI <a href="std_process.html" title="Create/destroy processes">std.process</a>)
$(LI <a href="std_random.html" title="Random number generation">std.random</a>)
$(LI <a href="std_range.html" title="Ranges">std.range</a>)
$(LI <a href="std_regex.html" title="regular expressions">std.regex</a>)
$(LI <a href="std_signals.html" title="Signals">std.signals</a>)
$(LI <a href="std_socket.html" title="Sockets">std.socket</a>)
$(LI <a href="std_socketstream.html" title="Stream for a blocking, connected Socket">std.socketstream</a>)
$(LI <a href="std_stdio.html" title="Standard I/O">std.stdio</a>)
$(LI <a href="std_cstream.html" title="Stream I/O">std.cstream</a>)
$(LI <a href="std_stream.html" title="Stream I/O">std.stream</a>)
$(LI <a href="std_string.html" title="Basic string operations">std.string</a>)
$(LI <a href="std_system.html" title="Inquire about the CPU, operating system">std.system</a>)
$(LI <a href="std_traits.html" title="Type traits">std.traits</a>)
$(LI <a href="std_typecons.html" title="Type constructors">std.typecons</a>)
$(LI <a href="std_typetuple.html" title="Type tuples">std.typetuple</a>)
$(LI <a href="std_uni.html" title="Unicode classification">std.uni</a>)
$(LI <a href="std_uri.html" title="Encode and decode Uniform Resource Identifiers (URIs)">std.uri</a>)
$(LI <a href="std_utf.html" title="Encode and decode utf character encodings">std.utf</a>)
$(LI <a href="std_uuid.html" title="Generate and use UUIDs">std.uuid</a>)
$(LI <a href="std_variant.html" title="Stores all types in a uniform, dynamically-checked representation">std.variant</a>)
$(LI <a href="std_xml.html" title="XML file processing">std.xml</a>)
$(LI <a href="std_zip.html" title="Read/write zip archives">std.zip</a>)
$(LI <a href="std_zlib.html" title="Compression / Decompression of data">std.zlib</a>)
$(LI <a href="std_net_curl.html" title="High level curl wrapper">std.net.curl</a>)
$(LI <a href="std_net_isemail.html" title="Validate e-mail addresses">std.net.isemail</a>)
$(LI <a href="std_digest_crc.html" title="CRC digest functions">std.digest.crc</a>)
$(LI <a href="std_digest_digest.html" title="API for digest functions">std.digest.digest</a>)
$(LI <a href="std_digest_md.html" title="MD digest functions">std.digest.md</a>)
$(LI <a href="std_digest_ripemd.html" title="RIPEMD digest functions">std.digest.ripemd</a>)
$(LI <a href="std_digest_sha.html" title="SHA digest functions">std.digest.sha</a>)
$(LI <a href="std_windows_charset.html" title="Conversion to/from Windows character sets">std.windows.charset</a>)
)
$(H2 <a href="index.html#etc" title="D etc modules">etc</a>)
$(UL
$(LI <a href="etc_c_curl.html" title="Interface to libcurl library">etc.c.curl</a>)
$(LI <a href="etc_c_sqlite3.html" title="Interface to sqlite3 library">etc.c.sqlite3</a>)
$(LI <a href="etc_c_zlib.html" title="Interface to zlib library">etc.c.zlib</a>)
)
$(H2 <a href="index.html#core" title="D core modules">core</a>)
$(UL
$(LI <a href="core_atomic.html" title="Atomic operations">core.atomic</a>)
$(LI <a href="core_bitop.html" title="Bitwise operations">core.bitop</a>)
$(LI <a href="core_cpuid.html" title="CPU identification">core.cpuid</a>)
$(LI <a href="core_demangle.html" title="D symbol mangling">core.demangle</a>)
$(LI <a href="core_exception.html" title="Root of exception hierarchy">core.exception</a>)
$(LI <a href="core_memory.html" title="Interface to memory management">core.memory</a>)
$(LI <a href="core_runtime.html" title="Interface to D runtime library internals">core.runtime</a>)
$(LI <a href="core_simd.html" title="Builtin SIMD intrinsics">core.simd</a>)
$(LI <a href="core_thread.html" title="Thread management">core.thread</a>)
$(LI <a href="core_time.html" title="Core time functionality">core.time</a>)
$(LI <a href="core_vararg.html" title="Variable function arguments">core.vararg</a>)
$(LI <a href="core_sync_barrier.html" title="Synchronizing progress of a group of threads">core.sync.barrier</a>)
$(LI <a href="core_sync_condition.html" title="Synchronized condition checking">core.sync.condition</a>)
$(LI <a href="core_sync_config.html" title="Stuff for core.sync">core.sync.config</a>)
$(LI <a href="core_sync_exception.html" title="SyncException">core.sync.exception</a>)
$(LI <a href="core_sync_mutex.html" title="Mutexes">core.sync.mutex</a>)
$(LI <a href="core_sync_rwmutex.html" title="R/W mutually exclusive access">core.sync.rwmutex</a>)
$(LI <a href="core_sync_semaphore.html" title="Semaphores">core.sync.semaphore</a>)
)
</div>
$(DIVID cssmenu, $(UL
$(MENU ../index.html, D Lib $(LATEST))
$(MENU ../phobos-prerelease/index.html, Prerelease Version)
$(MENU object.html, $(T tt, object))
$(MENU_W_SUBMENU $(T tt, std))
$(ITEMIZE
$(LIBITEM std, algorithm),
$(LIBITEM std, array),
$(LIBITEM std, ascii),
$(LIBITEM std, base64),
$(LIBITEM std, bigint),
$(LIBITEM std, bitmanip),
$(LIBITEM std, compiler),
$(LIBITEM std, complex),
$(LIBITEM std, concurrency),
$(LIBITEM std, container),
$(LIBITEM std, conv),
$(LIBITEM std, datetime),
$(LIBITEM std, digest, crc),
$(LIBITEM std, digest, digest),
$(LIBITEM std, digest, md),
$(LIBITEM std, digest, ripemd),
$(LIBITEM std, digest, sha),
$(LIBITEM std, encoding),
$(LIBITEM std, exception),
$(LIBITEM std, file),
$(LIBITEM std, format),
$(LIBITEM std, functional),
$(LIBITEM std, getopt),
$(LIBITEM std, json),
$(LIBITEM std, math),
$(LIBITEM std, mathspecial),
$(LIBITEM std, mmfile),
$(LIBITEM std, net, curl),
$(LIBITEM std, net, isemail),
$(LIBITEM std, numeric),
$(LIBITEM std, outbuffer),
$(LIBITEM std, parallelism),
$(LIBITEM std, path),
$(LIBITEM std, process),
$(LIBITEM std, random),
$(LIBITEM std, range),
$(LIBITEM std, regex),
$(LIBITEM std, signals),
$(LIBITEM std, socket),
$(LIBITEM std, socketstream),
$(LIBITEM std, stdio),
$(LIBITEM std, cstream),
$(LIBITEM std, stream),
$(LIBITEM std, string),
$(LIBITEM std, system),
$(LIBITEM std, traits),
$(LIBITEM std, typecons),
$(LIBITEM std, typetuple),
$(LIBITEM std, uni),
$(LIBITEM std, uri),
$(LIBITEM std, utf),
$(LIBITEM std, uuid),
$(LIBITEM std, variant),
$(LIBITEM std, windows, charset),
$(LIBITEM std, xml),
$(LIBITEM std, zip),
$(LIBITEM std, zlib)
)
$(MENU_W_SUBMENU $(T tt, etc))
$(ITEMIZE
$(LIBITEM etc, c, curl),
$(LIBITEM etc, c, sqlite),
$(LIBITEM etc, c, zlib)
)
$(MENU_W_SUBMENU $(T TT, core))
$(ITEMIZE
$(LIBITEM core, atomic),
$(LIBITEM core, bitop),
$(LIBITEM core, cpuid),
$(LIBITEM core, demangle),
$(LIBITEM core, exception),
$(LIBITEM core, memory),
$(LIBITEM core, runtime),
$(LIBITEM core, simd),
$(LIBITEM core, thread),
$(LIBITEM core, time),
$(LIBITEM core, vararg),
$(LIBITEM core, sync, barrier),
$(LIBITEM core, sync, condition),
$(LIBITEM core, sync, config),
$(LIBITEM core, sync, exception),
$(LIBITEM core, sync, mutex),
$(LIBITEM core, sync, rwmutex),
$(LIBITEM core, sync, semaphore)
)
$(MENU http://code.dlang.org, 3rd Party Packages)
))
_=

0 comments on commit 82f4348

Please sign in to comment.