From 7df9685d6ad90560b28879ebcb346a864d693072 Mon Sep 17 00:00:00 2001 From: jlukic Date: Fri, 10 Oct 2014 12:35:01 -0400 Subject: [PATCH] Fixes to definition type dropdown --- server/documents/hotfix.html.eco | 110 ++++++++++++++++++--- server/documents/modules/dropdown.html.eco | 51 ++++++---- server/documents/modules/popup.html.eco | 16 +-- server/files/javascript/semantic.js | 76 ++++++++------ server/files/stylesheets/semantic.css | 2 +- server/partials/header.html.eco | 13 ++- 6 files changed, 194 insertions(+), 74 deletions(-) diff --git a/server/documents/hotfix.html.eco b/server/documents/hotfix.html.eco index 3e3f003aa..d331a7566 100755 --- a/server/documents/hotfix.html.eco +++ b/server/documents/hotfix.html.eco @@ -11,14 +11,7 @@ type : 'Library' @@ -26,14 +19,99 @@ setTimeout(function(){ + -
- - - - -
+
+ +
+ Create new property +
+
+
+
+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
INR
+
+
+
+
+
+ +
+ +
Sq.ft
+
+
+
+
+
+
+
+ +
Available
Available
Blocked
Sold
+
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
Cancel
+
+ +
+
+
+
+
+
+
+ diff --git a/server/documents/modules/dropdown.html.eco b/server/documents/modules/dropdown.html.eco index 333536343..a94746fa2 100755 --- a/server/documents/modules/dropdown.html.eco +++ b/server/documents/modules/dropdown.html.eco @@ -454,16 +454,18 @@ themes : ['Default']

Inline

A dropdown can be formatted to appear inline in other content

- Show me posts trending -
-
today
- -
-
Today
-
This Week
-
This Month
+ + Show me posts trending +
+
today
+ +
+
Today
+
This Week
+
This Month
+
-
+
@@ -476,12 +478,12 @@ themes : ['Default']
- Shopping + Shopping
Categories
- Clothing + Clothing
Mens
Shirts
@@ -552,7 +554,7 @@ themes : ['Default']
Settings
- Upload Settings + Upload Settings
@@ -900,6 +902,21 @@ themes : ['Default']

Variations

+
+

Compact

+

A compact dropdown has no minimum width

+
+
Compact
+ +
+
A
+
B
+
C
+
+
+
+ +

Fluid

A dropdown can take the full width of its parent

@@ -1347,7 +1364,7 @@ themes : ['Default']
- Dogs + Dogs
Shiba Inu
Poodle
@@ -1356,7 +1373,7 @@ themes : ['Default']
- Cats + Cats
Aegean
Balinese
@@ -1436,7 +1453,7 @@ themes : ['Default']
- Categories + Categories
Unread
Promotions
@@ -1507,7 +1524,7 @@ themes : ['Default']
Save
-
+
Edit
@@ -1531,7 +1548,7 @@ themes : ['Default']
-
+
Go to
diff --git a/server/documents/modules/popup.html.eco b/server/documents/modules/popup.html.eco index 704915b6e..3b9954736 100755 --- a/server/documents/modules/popup.html.eco +++ b/server/documents/modules/popup.html.eco @@ -425,14 +425,14 @@ themes : ['Default']

Target Element

A popup can specify a different target element than itself to show a popup

- $('.test.button') - .popup({ - position : 'right center', - target : '.test.image', - title : 'My favorite dog', - content : 'My favorite dog would like other dogs as much as themselves' - }) - ; + $('.test.button') + .popup({ + position : 'top right', + target : '.test.image', + title : 'My favorite dog', + content : 'My favorite dog would like other dogs as much as themselves' + }) + ;
Hover Me
diff --git a/server/files/javascript/semantic.js b/server/files/javascript/semantic.js index 79f3de366..25c55af40 100755 --- a/server/files/javascript/semantic.js +++ b/server/files/javascript/semantic.js @@ -62,7 +62,7 @@ semantic.ready = function() { $example = $('.example'), $shownExample = $example.filter('.shown'), - $overview = $('.overview.button'), + $overview = $('.header.segment .overview'), //$developer = $('.header .developer.item'), //$designer = $('.header .designer.item'), @@ -505,26 +505,45 @@ semantic.ready = function() { return $element; } }, - overviewMode: function() { + changeMode: function(value) { + if(value == 'overview') { + handler.showOverview(); + } + else { + handler.hideOverview(); + if(value == 'design') { + handler.designerMode(); + } + if(value == 'code') { + handler.developerMode(); + } + } + $sectionHeaders.visibility('refresh'); + $sectionExample.visibility('refresh'); + $footer.visibility('refresh'); + }, + showOverview: function() { var - $button = $(this), $body = $('body'), $example = $('.example') ; - $body.toggleClass('overview'); - $button.toggleClass('active'); - if($body.hasClass('overview')) { - $example.each(function() { - $(this).children().not('.ui.header:eq(0), .example p:eq(0), .annotation').hide(); - }); - $example.filter('.another').hide(); - } - else { - $example.each(function() { - $(this).children().not('.ui.header:eq(0), .example p:eq(0), .annotation').show(); - }); - $example.filter('.another').show(); - } + $body.addClass('overview'); + $example.each(function() { + $(this).children().not('.ui.header:eq(0), .example p:eq(0)').hide(); + }); + $example.filter('.another').css('display', 'none'); + $('.sticky').sticky('refresh'); + }, + hideOverview: function() { + var + $body = $('body'), + $example = $('.example') + ; + $body.removeClass('overview'); + $example.each(function() { + $(this).children().not('.ui.header:eq(0), .example p:eq(0)').show(); + }); + $example.filter('.another').removeAttr('style'); $('.sticky').sticky('refresh'); }, developerMode: function() { @@ -532,9 +551,6 @@ semantic.ready = function() { $body = $('body'), $example = $('.example').not('.no') ; - if($body.hasClass('overview')) { - handler.overviewMode(); - } $example .each(function() { $.proxy(handler.createCode, $(this))('developer'); @@ -547,9 +563,6 @@ semantic.ready = function() { $body = $('body'), $example = $('.example').not('.no') ; - if($body.hasClass('overview')) { - handler.overviewMode(); - } $example .each(function() { $.proxy(handler.createCode, $(this))('designer'); @@ -683,9 +696,11 @@ semantic.ready = function() { $demo.fadeIn(500); } } - $sectionHeaders.visibility('refresh'); - $sectionExample.visibility('refresh'); - $footer.visibility('refresh'); + if(type === undefined) { + $sectionHeaders.visibility('refresh'); + $sectionExample.visibility('refresh'); + $footer.visibility('refresh'); + } }, createAnnotation: function() { @@ -937,7 +952,9 @@ semantic.ready = function() { } $helpPopup - .popup() + .popup({ + position: 'bottom right' + }) ; $swap @@ -945,7 +962,10 @@ semantic.ready = function() { ; $overview - .on('click', handler.overviewMode) + .dropdown({ + action: 'select', + onChange: handler.changeMode + }) ; $menuPopup diff --git a/server/files/stylesheets/semantic.css b/server/files/stylesheets/semantic.css index cf9658403..eee1d95b1 100755 --- a/server/files/stylesheets/semantic.css +++ b/server/files/stylesheets/semantic.css @@ -746,7 +746,7 @@ body#example.hide { #example h2 + .example i.code, #example h3 + .example i.code, #example h4 + .example i.code { - top: 0em; + top: 1em; } /* Spaced */ diff --git a/server/partials/header.html.eco b/server/partials/header.html.eco index 25147fd21..b03297aa4 100755 --- a/server/partials/header.html.eco +++ b/server/partials/header.html.eco @@ -14,14 +14,19 @@
<% end %> <% if @document.type is 'UI Module': %> - + Learn about Modules - + <% end %> <% if @document.type is 'UI Element' or @document.type is 'UI View' or @document.type is 'UI Collection' or @document.type is 'UI Module': %> -
- Definition +
+ Definition Type +
+
Design
+
Code
+
Summary
+
<% end %> <% if @document.themes?: %>