From fea242a05c49375b02f8999dbe569cfd8a21e3af Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 20 Oct 2014 22:21:23 -0400 Subject: [PATCH] Fix docs to work with new restructuring --- .gitignore | 12 +- docpad.coffee | 2 +- .../documents/collections/breadcrumb.html.eco | 2 +- server/documents/collections/form.html.eco | 2 +- server/documents/collections/grid.html.eco | 2 +- server/documents/collections/menu.html.eco | 2 +- server/documents/collections/message.html.eco | 2 +- server/documents/collections/table.html.eco | 2 +- server/documents/elements/button.html.eco | 2 +- server/documents/elements/divider.html.eco | 2 +- server/documents/elements/flag.html.eco | 2 +- server/documents/elements/header.html.eco | 2 +- server/documents/elements/input.html.eco | 2 +- server/documents/elements/label.html.eco | 2 +- server/documents/elements/list.html.eco | 2 +- server/documents/elements/progress.html.eco | 2 +- server/documents/elements/rail.html.eco | 2 +- server/documents/elements/segment.html.eco | 2 +- server/documents/elements/step.html.eco | 2 +- server/documents/globals/reset.html.eco | 2 +- server/documents/globals/site.html.eco | 2 +- server/documents/index.html.eco | 4 +- server/documents/modules/accordion.html.eco | 2 +- server/documents/modules/checkbox.html.eco | 2 +- server/documents/modules/dimmer.html.eco | 2 +- server/documents/modules/dropdown.html.eco | 2 +- server/documents/modules/modal.html.eco | 4 +- server/documents/modules/popup.html.eco | 2 +- server/documents/modules/rating.html.eco | 2 +- server/documents/modules/shape.html.eco | 2 +- server/documents/views/card.html.eco | 2 +- server/documents/views/comment.html.eco | 2 +- server/documents/views/feed.html.eco | 2 +- server/documents/views/item.html.eco | 2 +- server/documents/views/statistic.html.eco | 2 +- server/files/javascript/form.js | 2 +- server/files/javascript/semantic.js | 4 +- server/layouts/basic.html.eco | 143 +++++++++--------- server/layouts/default.html.eco | 136 ++++++++--------- 39 files changed, 178 insertions(+), 191 deletions(-) mode change 100644 => 100755 server/documents/views/statistic.html.eco mode change 100644 => 100755 server/layouts/basic.html.eco diff --git a/.gitignore b/.gitignore index 1267ffb84..503d44d68 100755 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,5 @@ -docs/ node_modules -node/server.json -test/coverage/ -coverage/ -build/**/**/site/ -src/build/ -src/**/site/ -src/semantic.config -build/**/**/semantic.config -semantic.config +out/ # Numerous always-ignore extensions *.diff @@ -17,6 +8,7 @@ semantic.config *.log *.rej *.swo + *.swp *.zip *.vi diff --git a/docpad.coffee b/docpad.coffee index a789cfa68..417b24f93 100755 --- a/docpad.coffee +++ b/docpad.coffee @@ -3,7 +3,7 @@ docpadConfig = { srcPath : './server' - outPath: './docs' + outPath: './out' plugins: ghpages: diff --git a/server/documents/collections/breadcrumb.html.eco b/server/documents/collections/breadcrumb.html.eco index 8f0a74778..e0ff92e84 100755 --- a/server/documents/collections/breadcrumb.html.eco +++ b/server/documents/collections/breadcrumb.html.eco @@ -15,7 +15,7 @@ themes : ['Default'] <%- @partial('header') %> - +
diff --git a/server/documents/collections/form.html.eco b/server/documents/collections/form.html.eco index 601b7870d..053336f31 100755 --- a/server/documents/collections/form.html.eco +++ b/server/documents/collections/form.html.eco @@ -11,7 +11,7 @@ type : 'UI Collection' themes : ['Default', 'Flat', 'Chubby', 'GitHub'] --- - + <%- @partial('header') %> diff --git a/server/documents/collections/grid.html.eco b/server/documents/collections/grid.html.eco index 172e4fa1b..64d4a6faa 100755 --- a/server/documents/collections/grid.html.eco +++ b/server/documents/collections/grid.html.eco @@ -11,7 +11,7 @@ type : 'UI Collection' themes : ['Default'] --- - + <%- @partial('header', { tabs: { overview: 'Overview', definition: 'Definition' } }) %> diff --git a/server/documents/collections/menu.html.eco b/server/documents/collections/menu.html.eco index fc666eb5d..6071d1fca 100755 --- a/server/documents/collections/menu.html.eco +++ b/server/documents/collections/menu.html.eco @@ -11,7 +11,7 @@ type : 'UI Collection' themes : ['Default', 'GitHub'] --- - + <%- @partial('header') %> diff --git a/server/documents/collections/message.html.eco b/server/documents/collections/message.html.eco index 31b40274a..e8d6e9bc1 100755 --- a/server/documents/collections/message.html.eco +++ b/server/documents/collections/message.html.eco @@ -11,7 +11,7 @@ type : 'UI Collection' themes : ['Default', 'GitHub', 'Google'] --- - + <%- @partial('header') %>
diff --git a/server/documents/collections/table.html.eco b/server/documents/collections/table.html.eco index ba6f31b3b..1741a4b0f 100755 --- a/server/documents/collections/table.html.eco +++ b/server/documents/collections/table.html.eco @@ -12,7 +12,7 @@ type : 'UI Collection' themes : ['Default', 'Classic'] --- - + <%- @partial('header') %> diff --git a/server/documents/elements/button.html.eco b/server/documents/elements/button.html.eco index f18ace130..1289bda2f 100755 --- a/server/documents/elements/button.html.eco +++ b/server/documents/elements/button.html.eco @@ -10,7 +10,7 @@ type : 'UI Element' themes : ['Default', 'Classic', 'Basic', 'Raised', 'Chubby', 'Round', 'Amazon', 'Google', 'GitHub'] --- - + <%- @partial('header') %> diff --git a/server/documents/elements/divider.html.eco b/server/documents/elements/divider.html.eco index e40fdc9b1..38967e4eb 100755 --- a/server/documents/elements/divider.html.eco +++ b/server/documents/elements/divider.html.eco @@ -13,7 +13,7 @@ themes : ['default'] --- <%- @partial('header') %> - +
diff --git a/server/documents/elements/flag.html.eco b/server/documents/elements/flag.html.eco index 40b4f2b0e..3e90a3f96 100755 --- a/server/documents/elements/flag.html.eco +++ b/server/documents/elements/flag.html.eco @@ -9,7 +9,7 @@ description : 'A flag is is used to represent a political state' type : 'UI Element' --- - + <%- @partial('header', { tabs: { flags: 'Flags' } }) %> diff --git a/server/documents/elements/header.html.eco b/server/documents/elements/header.html.eco index 80e4cd0e8..289631fe9 100755 --- a/server/documents/elements/header.html.eco +++ b/server/documents/elements/header.html.eco @@ -13,7 +13,7 @@ themes : ['Default', 'Classic', 'Bookish', 'Chubby'] --- <%- @partial('header') %> - +
diff --git a/server/documents/elements/input.html.eco b/server/documents/elements/input.html.eco index 11e7d68db..5c87bb143 100755 --- a/server/documents/elements/input.html.eco +++ b/server/documents/elements/input.html.eco @@ -13,7 +13,7 @@ themes : ['Default'] --- <%- @partial('header') %> - +
diff --git a/server/documents/elements/label.html.eco b/server/documents/elements/label.html.eco index 53d745352..5ade3ea2e 100755 --- a/server/documents/elements/label.html.eco +++ b/server/documents/elements/label.html.eco @@ -11,7 +11,7 @@ type : 'UI Element' themes : ['Default'] --- - + --- <%- @partial('header') %> diff --git a/server/documents/elements/list.html.eco b/server/documents/elements/list.html.eco index e19c3761e..f08e03fa6 100755 --- a/server/documents/elements/list.html.eco +++ b/server/documents/elements/list.html.eco @@ -11,7 +11,7 @@ type : 'UI Element' themes : ['Default'] --- - + <%- @partial('header') %>
diff --git a/server/documents/elements/progress.html.eco b/server/documents/elements/progress.html.eco index e3497014d..a265e1a1f 100755 --- a/server/documents/elements/progress.html.eco +++ b/server/documents/elements/progress.html.eco @@ -11,7 +11,7 @@ type : 'UI Module' themes : ['Default', 'Classic', 'Basic', 'Striped'] --- - + <%- @partial('header', { tabs: { definition: 'Definition', usage: 'Usage' } }) %> diff --git a/server/documents/elements/rail.html.eco b/server/documents/elements/rail.html.eco index 0200c5ff4..4a708d71d 100755 --- a/server/documents/elements/rail.html.eco +++ b/server/documents/elements/rail.html.eco @@ -10,7 +10,7 @@ status : 'Undocumented' type : 'UI Element' --- - + <%- @partial('header') %> diff --git a/server/documents/elements/segment.html.eco b/server/documents/elements/segment.html.eco index 471f86c1c..8b24bf60d 100755 --- a/server/documents/elements/segment.html.eco +++ b/server/documents/elements/segment.html.eco @@ -11,7 +11,7 @@ type : 'UI Element' themes : ['default', 'GitHub'] --- <%- @partial('header') %> - +
diff --git a/server/documents/elements/step.html.eco b/server/documents/elements/step.html.eco index e4ac33717..a3f9ddd99 100755 --- a/server/documents/elements/step.html.eco +++ b/server/documents/elements/step.html.eco @@ -13,7 +13,7 @@ themes : ['default', 'Basic', 'GitHub'] --- <%- @partial('header') %> - +
diff --git a/server/documents/globals/reset.html.eco b/server/documents/globals/reset.html.eco index ce5b73f60..28be1117e 100755 --- a/server/documents/globals/reset.html.eco +++ b/server/documents/globals/reset.html.eco @@ -11,7 +11,7 @@ type : 'UI Global' themes : ['Default', 'Basic', 'Resetcss'] --- - + <%- @partial('header', { tabs: { overview: 'Overview', test: 'Test' } }) %> diff --git a/server/documents/globals/site.html.eco b/server/documents/globals/site.html.eco index abf784f6c..0d9923f45 100755 --- a/server/documents/globals/site.html.eco +++ b/server/documents/globals/site.html.eco @@ -10,7 +10,7 @@ status : 'Undocumented' type : 'UI Global' --- - + <%- @partial('header') %> diff --git a/server/documents/index.html.eco b/server/documents/index.html.eco index b405526d3..175ddedaf 100755 --- a/server/documents/index.html.eco +++ b/server/documents/index.html.eco @@ -7,7 +7,7 @@ type : 'Semantic' - +
@@ -39,7 +39,7 @@ type : 'Semantic' is the vocabulary of the web. - + Download Now diff --git a/server/documents/modules/accordion.html.eco b/server/documents/modules/accordion.html.eco index d459579b4..aeafbee68 100755 --- a/server/documents/modules/accordion.html.eco +++ b/server/documents/modules/accordion.html.eco @@ -10,7 +10,7 @@ type : 'UI Module' themes : ['Default', 'Chubby'] --- - + <%- @partial('header', { tabs: 'module' }) %> diff --git a/server/documents/modules/checkbox.html.eco b/server/documents/modules/checkbox.html.eco index 6c992bbee..00a9d8a34 100755 --- a/server/documents/modules/checkbox.html.eco +++ b/server/documents/modules/checkbox.html.eco @@ -11,7 +11,7 @@ type : 'UI Module' themes : ['Default'] --- - + <%- @partial('header', { tabs: 'module' }) %> diff --git a/server/documents/modules/dimmer.html.eco b/server/documents/modules/dimmer.html.eco index affc3b38d..899cbb8c3 100755 --- a/server/documents/modules/dimmer.html.eco +++ b/server/documents/modules/dimmer.html.eco @@ -11,7 +11,7 @@ type : 'UI Module' themes : ['Default'] --- - + diff --git a/server/documents/modules/dropdown.html.eco b/server/documents/modules/dropdown.html.eco index eed5492c4..c687e7541 100755 --- a/server/documents/modules/dropdown.html.eco +++ b/server/documents/modules/dropdown.html.eco @@ -12,7 +12,7 @@ elementType : 'module' themes : ['Default'] --- - + diff --git a/server/documents/modules/modal.html.eco b/server/documents/modules/modal.html.eco index 48eecf7ce..2d6036a3e 100755 --- a/server/documents/modules/modal.html.eco +++ b/server/documents/modules/modal.html.eco @@ -11,7 +11,7 @@ type : 'UI Module' themes : ['Default', 'Fixed-width'] --- - + <%- @partial('header', { tabs: 'module' }) %> @@ -652,4 +652,4 @@ themes : ['Default', 'Fixed-width']
- \ No newline at end of file + \ No newline at end of file diff --git a/server/documents/modules/popup.html.eco b/server/documents/modules/popup.html.eco index a91733517..8a9051922 100755 --- a/server/documents/modules/popup.html.eco +++ b/server/documents/modules/popup.html.eco @@ -11,7 +11,7 @@ type : 'UI Module' themes : ['Default'] --- - + <%- @partial('header', { tabs: 'module' }) %> diff --git a/server/documents/modules/rating.html.eco b/server/documents/modules/rating.html.eco index 2e4041ea7..3c0195a06 100755 --- a/server/documents/modules/rating.html.eco +++ b/server/documents/modules/rating.html.eco @@ -14,7 +14,7 @@ themes : ['Default'] <%- @partial('header', { tabs: 'module' }) %> - +
diff --git a/server/documents/modules/shape.html.eco b/server/documents/modules/shape.html.eco index f95e3c221..b5696a5bd 100755 --- a/server/documents/modules/shape.html.eco +++ b/server/documents/modules/shape.html.eco @@ -11,7 +11,7 @@ type : 'UI Module' themes : ['default'] --- - + diff --git a/server/documents/views/card.html.eco b/server/documents/views/card.html.eco index 7a6878b74..3ddd5b084 100755 --- a/server/documents/views/card.html.eco +++ b/server/documents/views/card.html.eco @@ -14,7 +14,7 @@ themes : ['Default', 'Basic', 'Classic'] <%- @partial('header') %> - +
diff --git a/server/documents/views/comment.html.eco b/server/documents/views/comment.html.eco index a1ce33151..cf1d2829f 100755 --- a/server/documents/views/comment.html.eco +++ b/server/documents/views/comment.html.eco @@ -13,7 +13,7 @@ themes : ['Default', 'Chubby'] --- <%- @partial('header') %> - +
diff --git a/server/documents/views/feed.html.eco b/server/documents/views/feed.html.eco index d55d3d273..aeb076fa6 100755 --- a/server/documents/views/feed.html.eco +++ b/server/documents/views/feed.html.eco @@ -12,7 +12,7 @@ elementType : 'view' themes : ['Default', 'Timeline'] --- - + <%- @partial('header') %>
diff --git a/server/documents/views/item.html.eco b/server/documents/views/item.html.eco index 3aaa8ee90..ead6aa9b1 100755 --- a/server/documents/views/item.html.eco +++ b/server/documents/views/item.html.eco @@ -14,7 +14,7 @@ themes : ['Default'] <%- @partial('header') %> - +
diff --git a/server/documents/views/statistic.html.eco b/server/documents/views/statistic.html.eco old mode 100644 new mode 100755 index 62146e3f5..3fdfefbe7 --- a/server/documents/views/statistic.html.eco +++ b/server/documents/views/statistic.html.eco @@ -14,7 +14,7 @@ themes : ['Default'] <%- @partial('header') %> - +
diff --git a/server/files/javascript/form.js b/server/files/javascript/form.js index 3795946c1..a1300895d 100755 --- a/server/files/javascript/form.js +++ b/server/files/javascript/form.js @@ -6,7 +6,7 @@ semantic.validateForm.ready = function() { // selector cache var $codeDropdown = $('.existing.code .dropdown'), - $dropdown = $('select.dropdown').not($codeDropdown), + $dropdown = $('.ui.dropdown').not($codeDropdown), // alias handler ; diff --git a/server/files/javascript/semantic.js b/server/files/javascript/semantic.js index c37265653..278679818 100755 --- a/server/files/javascript/semantic.js +++ b/server/files/javascript/semantic.js @@ -397,8 +397,8 @@ semantic.ready = function() { changeTheme: function(theme) { var $themeDropdown = $(this), - variableURL = '/build/less/themes/packages/{$theme}/{$type}s/{$element}.variables', - overrideURL = '/build/less/themes/packages/{$theme}/{$type}s/{$element}.overrides', + variableURL = '/src/themes/{$theme}/{$type}s/{$element}.variables', + overrideURL = '/src/themes/{$theme}/{$type}s/{$element}.overrides', urlData = { theme : typeof(theme === 'string') ? theme.toLowerCase() diff --git a/server/layouts/basic.html.eco b/server/layouts/basic.html.eco old mode 100644 new mode 100755 index bafbc78e5..6ee728d8e --- a/server/layouts/basic.html.eco +++ b/server/layouts/basic.html.eco @@ -17,61 +17,58 @@ <% if 'development' in @getEnvironments(): %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% else: %> - + <% end %> - - - @@ -109,28 +106,28 @@ <% if 'development' in @getEnvironments(): %> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + <% else: %> - + <% end %> diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco index 41d19605c..2ddc4ebdd 100755 --- a/server/layouts/default.html.eco +++ b/server/layouts/default.html.eco @@ -1,7 +1,6 @@ - <% uiIntroduction = @getCollection("documents").findAll({type: $in: ['UI Introduction']},[{title: 1}]).toJSON() %> <% uiProject = @getCollection("documents").findAll({type: $in: ['Semantic Project']},[{title: 1}]).toJSON() %> <% uiGuide = @getCollection("documents").findAll({type: $in: ['UI Guide']},[{title: 1}]).toJSON() %> @@ -32,59 +31,58 @@ <% if 'development' in @getEnvironments(): %> - - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + <% else: %> - + <% end %> - @@ -124,29 +122,29 @@ <% if 'development' in @getEnvironments(): %> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + <% else: %> - + <% end %> @@ -185,7 +183,7 @@ UI Docs
- + Download