nitdoc: move css files to share/css/ dir

[nit.git] / src / nitdoc.nit

diff --git a/src/nitdoc.nit b/src/nitdoc.nit
index 354aee2..c9691bf 100644 (file)
--- a/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@ -235,18 +235,11 @@ abstract class NitdocPage
 
        protected fun head do
                append("<meta charset='utf-8'/>")
-               append("<script type='text/javascript' src='{shareurl}/scripts/jquery-1.7.1.min.js'></script>")
-               append("<script type='text/javascript' src='{shareurl}/scripts/ZeroClipboard.min.js'></script>")
-               append("<script type='text/javascript' src='{shareurl}/scripts/Nitdoc.UI.js'></script>")
-               append("<script type='text/javascript' src='{shareurl}/scripts/Markdown.Converter.js'></script>")
-               append("<script type='text/javascript' src='{shareurl}/scripts/base64.js'></script>")
-               append("<script type='text/javascript' src='{shareurl}/scripts/Nitdoc.GitHub.js'></script>")
-               append("<script type='text/javascript' src='quicksearch-list.js'></script>")
-               append("<script type='text/javascript' src='{shareurl}/scripts/Nitdoc.QuickSearch.js'></script>")
-               append("<link rel='stylesheet' href='{shareurl}/styles/main.css' type='text/css' media='screen'/>")
-               append("<link rel='stylesheet' href='{shareurl}/styles/Nitdoc.UI.css' type='text/css' media='screen'/>")
-               append("<link rel='stylesheet' href='{shareurl}/styles/Nitdoc.QuickSearch.css' type='text/css' media='screen'/>")
-               append("<link rel='stylesheet' href='{shareurl}/styles/Nitdoc.GitHub.css' type='text/css' media='screen'/>")
+               append("<link rel='stylesheet' href='{shareurl}/css/main.css' type='text/css'/>")
+               append("<link rel='stylesheet' href='{shareurl}/css/Nitdoc.UI.css' type='text/css''/>")
+               append("<link rel='stylesheet' href='{shareurl}/css/Nitdoc.QuickSearch.css' type='text/css'/>")
+               append("<link rel='stylesheet' href='{shareurl}/css/Nitdoc.GitHub.css' type='text/css'/>")
+               append("<link rel='stylesheet' href='{shareurl}/css/Nitdoc.ModalBox.css' type='text/css'/>")
                var title = ""
                if ctx.opt_custom_title.value != null then
                        title = " | {ctx.opt_custom_title.value.to_s}"
@@ -320,6 +313,7 @@ abstract class NitdocPage
                head
                append("</head>")
                append("<body")
+               append(" data-bootstrap-share='{shareurl}'")
                if ctx.opt_github_upstream.value != null and ctx.opt_github_base_sha1.value != null then
                        append(" data-github-upstream='{ctx.opt_github_upstream.value.as(not null)}'")
                        append(" data-github-base-sha1='{ctx.opt_github_base_sha1.value.as(not null)}'")
@@ -332,6 +326,7 @@ abstract class NitdocPage
                content
                append("</div>")
                footer
+               append("<script data-main=\"{shareurl}/js/nitdoc\" src=\"{shareurl}/js/lib/require.js\"></script>")
 
                # piwik tracking
                var tracker_url = ctx.opt_piwik_tracker.value
@@ -1830,11 +1825,13 @@ redef class AModule
                return ""
        end
 
+       # The doc location or the first line of the block if doc node is null
        private fun doc_location: Location do
                if n_moduledecl != null and n_moduledecl.n_doc != null then
                        return n_moduledecl.n_doc.location
                end
-               return location
+               var l = location
+               return new Location(l.file, l.line_start, l.line_start, l.column_start, l.column_start)
        end
 end
 
@@ -1854,9 +1851,11 @@ redef class AStdClassdef
                return ""
        end
 
+       # The doc location or the first line of the block if doc node is null
        private fun doc_location: Location do
                if n_doc != null then return n_doc.location
-               return location
+               var l = location
+               return new Location(l.file, l.line_start, l.line_start, l.column_start, l.column_start)
        end
 end
 
@@ -1878,7 +1877,9 @@ redef class APropdef
 
        private fun doc_location: Location do
                if n_doc != null then return n_doc.location
-               return location
+               var l = location
+               return new Location(l.file, l.line_start, l.line_start, l.column_start, l.column_start)
+
        end
 end