From c2c3ec5c558488c6cde6be4b5439f6809b8fac6a Mon Sep 17 00:00:00 2001 From: jlukic Date: Fri, 19 Sep 2014 18:35:36 -0400 Subject: [PATCH] Adds back in modal --- server/draft/carousel.html | 143 -------------- server/draft/chat.html | 276 ---------------------------- server/files/javascript/semantic.js | 4 +- server/layouts/default.html.eco | 6 +- 4 files changed, 5 insertions(+), 424 deletions(-) delete mode 100755 server/draft/carousel.html delete mode 100755 server/draft/chat.html diff --git a/server/draft/carousel.html b/server/draft/carousel.html deleted file mode 100755 index 62e9e52d8..000000000 --- a/server/draft/carousel.html +++ /dev/null @@ -1,143 +0,0 @@ ---- -layout : 'default' -css : 'carousel' - -title : 'Carousel' -description : 'A carousel alternates display between several pieces of content in sequence.' -type : 'UI Module' ---- - - -<%- @partial('header') %> - -
- -

Standard

-
-

Carousel

-

A standard carousel

-
- - -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
- - - - -
-
- -
- -

Usage

- -

Initializing

-

Initializing a carousel

-
- $('.ui.carousel') - .carousel() - ; -
- -

Settings

- - - - - - - - - - - - - - - - -
Carousel Settings
requiredautoSetting to true/false will determine whether an input will allow no selection. Auto will set disallow this behavior only for radio boxes
contextfalseA selector or jQuery object to use as a delegated event context
- - - - - - - - - - - - - - - - - - - - - - -
Callbacks
onChangeNoneCallback after a carousel is either disabled or enabled.
onEnableNoneCallback after a carousel is enabled.
onDisableNoneCallback after a carousel is disabled.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UI Module Settings
NameCarouselName used in debug logs
debugTrueProvides standard debug output to console
performanceFalseProvides standard debug output to console
verboseFalseProvides ancillary debug output to console
namespacecarouselEvent namespace. Makes sure module teardown does not effect other events attached to an element.
errors -
- errors : { - method : 'The method you called is not defined.' - } -
-
-
\ No newline at end of file diff --git a/server/draft/chat.html b/server/draft/chat.html deleted file mode 100755 index 16c2e3e6e..000000000 --- a/server/draft/chat.html +++ /dev/null @@ -1,276 +0,0 @@ ---- -layout : 'default' -css : 'chatroom' -ignored : true - -title : 'Chatroom' -description : 'A chatroom allows users to communicate with each other in real time.' -type : 'UI Module' ---- - - - - - - -<%- @partial('header') %> - -
- -

Usage

- -

Initializing a chat room

-

Using chatroom requires an account with pusher, a company that provides turn-key web socket access.

- -
- // modify these for your api settings received from pusher - $('.ui.chatroom') - .chatroom({ - key : 'f812089c851866cc2f3e', - endpoint: { - authentication : '/chat/authentication', - message : '/chat/send' - } - }) - ; -
-
-
-
- - Joining chat -
-
-
- -
-
- -
-
-
-
-
-
-
Loading
-
-
-
-
-
- -
- -
- - Send -
-
-
- - -

Settings

- -
- -

Chatroom Settings

-

Chatroom settings modify the chatroom's behavior

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingDefaultDescription
keyfalsePusher API key
keypresence-chatChannel to use. Pusher requires chatrooms to use channels beginning with presence-
scrollArea9999If a user is this many pixels away from bottom of the page it will automatically scroll when a message is receieved
customEvents{}An object containing custom events and functions to use with pusher
endpoint -
- { - message: false, - authentication: false - } -
- 		Endpoints used to communicate authentication and chat messages
partingMessagesfalseWhether to display messages when a user has joined chat
userCounttrueWhether to display the current logged in user count
- -
-

Callbacks

-

Callbacks specify a function to occur after a specific behavior.

- - - - - - - - - - - - - - -
SettingContextDescription
onJoin(user)ChatroomCalled after each user joins a chat room
- -
- -
- -

DOM Settings

-

DOM settings specify how this module should interface with the DOM

- - - - - - - - - - - - - - - - - - - - - -
SettingDefaultDescription
namespacechatroomEvent namespace. Makes sure module teardown does not effect other events attached to an element.
selector -
- selector : { - icon : '.icon' - } -
-
className -
- className : { - active : 'active', - hover : 'hover', - loading : 'loading' - }, -
-
- -
- -
- -

Debug Settings

-

Debug settings controls debug output to the console

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingDefaultDescription
nameChatroomName used in debug logs
debugTrueProvides standard debug output to console
performanceTrueProvides performance output to console
verboseTrueProvides ancillary debug output to console
selector -
- selector : { - userCount : '.actions .message', - userListButton : '.actions .list.button', - expandButton : '.actions .expand.button', - room : '.room', - userList : '.room .list', - log : '.room .log', - message : '.room .log .message', - author : '.room log .message .author', - messageInput : '.talk input', - messageButton : '.talk .send.button' - } -
-
className -
- className : { - expand : 'expand', - active : 'active', - hover : 'hover', - down : 'down', - loading : 'loading' - } -
-
error -
- error: { - method : 'The method you called is not defined', - endpoint : 'Please define a message and authentication endpoint.', - key : 'You must specify a pusher key and channel.', - pusher : 'You must include the Pusher library.' - } -
-
- -
- -
\ No newline at end of file diff --git a/server/files/javascript/semantic.js b/server/files/javascript/semantic.js index 52b10895c..2db15a8cd 100755 --- a/server/files/javascript/semantic.js +++ b/server/files/javascript/semantic.js @@ -924,7 +924,7 @@ semantic.ready = function() { percent = $choice.data('percent') || 0 ; window.Transifex.live.translateTo(value, true); - /*if(percent < 100) { + if(percent < 100) { $('.language.modal') .find('.header .name') .html(text) @@ -936,7 +936,7 @@ semantic.ready = function() { $('.language.modal .progress .bar').css('width', percent + '%'); }) ; - }*/ + } } }) diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco index 4f17340c0..bebc34e2d 100755 --- a/server/layouts/default.html.eco +++ b/server/layouts/default.html.eco @@ -313,7 +313,7 @@ - +