From 02afd8a32edb13ea7fc2266ac80092ea15c0930c Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 9 Oct 2013 15:52:53 +0800 Subject: * treat 'apps/utils' as regular django app; which used to store general tools for used in other apps * moved 'templatetags' from 'apps/indicator' to 'apps/utils' * '.gitignore' to ignore 'fixtures_bak' * moved js plugins from 'apps/indicator/static/plugins' to 'staticfiles/plugins' apps/recommend: * updated 'recommend.models'; o commented 'recommend.models.ResearchCombination' (not used) * implemented views 'add_edit_blog_info' and 'ajax_add_edit_configs'; * added pages 'templates/recommend/add_edit_blog_info.html', 'add_edit_blog_info_error.html'; o related css and javascripts files * added 'tools.py'; * added 'utils/tools.py' for placing generic functions; * deleted 'initial_data.json' (mv 'fixtures' to 'fixtures_bak'); * small fixes to 'indicator.models', 'sciblog.models' and 'sfaccount.views' * fixed automatically show 'proper_nouns' annotation in blog: recovered the line 'import signals' in 'sciblog.models' * added 'is_ok()' method for 'recommend.models.ResearchConfig'; --- .../plugins/jquery-ui/demos/dialog/animated.html | 52 ------- .../plugins/jquery-ui/demos/dialog/default.html | 33 ----- .../plugins/jquery-ui/demos/dialog/index.html | 19 --- .../jquery-ui/demos/dialog/modal-confirmation.html | 47 ------ .../plugins/jquery-ui/demos/dialog/modal-form.html | 157 --------------------- .../jquery-ui/demos/dialog/modal-message.html | 49 ------- .../plugins/jquery-ui/demos/dialog/modal.html | 38 ----- 7 files changed, 395 deletions(-) delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/animated.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/default.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/index.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-confirmation.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-form.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-message.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal.html (limited to '97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog') diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/animated.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/animated.html deleted file mode 100644 index f9dc697..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/animated.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - jQuery UI Dialog - Animation - - - - - - - - - - - - - - - - - - -
-

This is an animated dialog which is useful for displaying information. The dialog window can be moved, resized and closed with the 'x' icon.

-
- - - -
-

Dialogs may be animated by specifying an effect for the show and/or hide properties. You must include the individual effects file for any effects you would like to use.

-
- - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/default.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/default.html deleted file mode 100644 index dc9741a..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/default.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - jQuery UI Dialog - Default functionality - - - - - - - - - - - - - - - -
-

This is the default dialog which is useful for displaying information. The dialog window can be moved, resized and closed with the 'x' icon.

-
- -
-

The basic dialog window is an overlay positioned within the viewport and is protected from page content (like select elements) shining through with an iframe. It has a title bar and a content area, and can be moved, resized and closed with the 'x' icon by default.

-
- - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/index.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/index.html deleted file mode 100644 index 6aaa3ec..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - jQuery UI Dialog Demos - - - - - - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-confirmation.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-confirmation.html deleted file mode 100644 index 7538cd1..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-confirmation.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - jQuery UI Dialog - Modal confirmation - - - - - - - - - - - - - - - -
-

These items will be permanently deleted and cannot be recovered. Are you sure?

-
- -

Sed vel diam id libero rutrum convallis. Donec aliquet leo vel magna. Phasellus rhoncus faucibus ante. Etiam bibendum, enim faucibus aliquet rhoncus, arcu felis ultricies neque, sit amet auctor elit eros a lectus.

- -
-

Confirm an action that may be destructive or important. Set the modal option to true, and specify primary and secondary user actions with the buttons option.

-
- - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-form.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-form.html deleted file mode 100644 index a9f1c63..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-form.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - jQuery UI Dialog - Modal form - - - - - - - - - - - - - - - - - - -
-

All form fields are required.

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

Existing Users:

- - - - - - - - - - - - - - - -
NameEmailPassword
John Doejohn.doe@example.comjohndoe1
-
- - -
-

Use a modal dialog to require that the user enter data during a multi-step process. Embed form markup in the content area, set the modal option to true, and specify primary and secondary user actions with the buttons option.

-
- - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-message.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-message.html deleted file mode 100644 index 0a6f813..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal-message.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - jQuery UI Dialog - Modal message - - - - - - - - - - - - - - - - -
-

- - Your files have downloaded successfully into the My Downloads folder. -

-

- Currently using 36% of your storage space. -

-
- -

Sed vel diam id libero rutrum convallis. Donec aliquet leo vel magna. Phasellus rhoncus faucibus ante. Etiam bibendum, enim faucibus aliquet rhoncus, arcu felis ultricies neque, sit amet auctor elit eros a lectus.

- -
-

Use a modal dialog to explicitly acknowledge information or an action before continuing their work. Set the modal option to true, and specify a primary action (Ok) with the buttons option.

-
- - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal.html deleted file mode 100644 index 4579df2..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/demos/dialog/modal.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - jQuery UI Dialog - Basic modal - - - - - - - - - - - - - - - -
-

Adding the modal overlay screen makes the dialog look more prominent because it dims out the page content.

-
- -

Sed vel diam id libero rutrum convallis. Donec aliquet leo vel magna. Phasellus rhoncus faucibus ante. Etiam bibendum, enim faucibus aliquet rhoncus, arcu felis ultricies neque, sit amet auctor elit eros a lectus.

- -
-

A modal dialog prevents the user from interacting with the rest of the page until it is closed.

-
- - -- cgit v1.2.2