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'; --- .../tests/visual/compound/accordion_tabs.html | 86 --------------- .../tests/visual/compound/datepicker_dialog.html | 31 ------ .../tests/visual/compound/dialog_widgets.html | 101 ------------------ .../tests/visual/compound/draggable_accordion.html | 65 ------------ ...aggable_accordion_accordion_tabs_draggable.html | 107 ------------------- .../compound/sortable_accordion_sortable_tabs.html | 116 --------------------- .../jquery-ui/tests/visual/compound/tabs_tabs.html | 73 ------------- .../tests/visual/compound/tabs_tooltips.html | 37 ------- 8 files changed, 616 deletions(-) delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/accordion_tabs.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/datepicker_dialog.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/dialog_widgets.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/draggable_accordion.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/sortable_accordion_sortable_tabs.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/tabs_tabs.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/tabs_tooltips.html (limited to '97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound') diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/accordion_tabs.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/accordion_tabs.html deleted file mode 100644 index 3fa541e..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/accordion_tabs.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - Compound Visual Test : Accordion in Tabs - - - - - - - - - - - -
- -
-
-

Accordion Header 1

-
-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-
-

Accordion Header 2

-
-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-
-

Accordion Header 3

-
-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-
-
-
-
-
-

Accordion Header 1

-
-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-
-

Accordion Header 2

-
-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-
-

Accordion Header 3

-
-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-
-
-
-
- - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/datepicker_dialog.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/datepicker_dialog.html deleted file mode 100644 index 315a935..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/datepicker_dialog.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Compound Visual Test : Datepicker in Dialog - - - - - - - - - - - - - - - -
- -
- - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/dialog_widgets.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/dialog_widgets.html deleted file mode 100644 index bc4777a..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/dialog_widgets.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - Compound Visual Test : All Widgets in Dialog - - - - - - - - - - - - - - - - - - - - - - - -
-
-

Accordion Header 1

-
- Accordion Content 1 -
-

Accordion Header 2

-
- Accordion Content 2 -
-

Accordion Header 3

-
- Accordion Content 3 -
-
- - - - -
- -
-
-
-
-
- -
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-
Phasellus mattis tincidunt nibh.
-
Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.
-
-
-
- Yay, another dialog. -
- - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/draggable_accordion.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/draggable_accordion.html deleted file mode 100644 index 4b6f1c4..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/draggable_accordion.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - Compound Visual Test : Draggable in Accordion - - - - - - - - - - - - - -
-

.draggable()

-
-
Draggable 1-1
-
Draggable 1-2
-
Draggable 1-3
-
Draggable 1-4
-
Draggable 1-5
-
-

.draggable({ appendTo: "body" })

-
-
Draggable 2-1
-
Draggable 2-2
-
Draggable 2-3
-
Draggable 2-4
-
Draggable 2-5
-
-

.draggable({ helper: "clone", appendTo: "body" })

-
-
Draggable 3-1
-
Draggable 3-2
-
Draggable 3-3
-
Draggable 3-4
-
Draggable 3-5
-
-
- - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html deleted file mode 100644 index 9b03c74..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - Compound Visual Test : Draggable in Accordion - - - - - - - - - - - - - -
-

Drag me around!

-
- -
-

Click the other tab!

-
-
-
-

Accordion Group 1

-
-

Header 1-1

-
-
Draggable 1-1
-
Draggable 1-2
-
Draggable 1-3
-
Draggable 1-4
-
Draggable 1-5
-
-

Header 1-2

-
-
Draggable 2-1
-
Draggable 2-2
-
Draggable 2-3
-
Draggable 2-4
-
Draggable 2-5
-
-
-

Accordion Group 2

-
-

Header 2-1

-
-
Draggable 1-1
-
Draggable 1-2
-
Draggable 1-3
-
Draggable 1-4
-
Draggable 1-5
-
-

Header 2-2

-
-
Draggable 2-1
-
Draggable 2-2
-
Draggable 2-3
-
Draggable 2-4
-
Draggable 2-5
-
-
-
-
-
-
- - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/sortable_accordion_sortable_tabs.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/sortable_accordion_sortable_tabs.html deleted file mode 100644 index e87e563..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/sortable_accordion_sortable_tabs.html +++ /dev/null @@ -1,116 +0,0 @@ - - - - - Compound Visual Test : Accordion in Tabs - - - - - - - - - - - - - -
- -
-
-
-

Accordion Header 1

-
-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-
-
-
-

Accordion Header 2

-
-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-
-
-
-

Accordion Header 3

-
-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-
-
-
-
-
-

Nothing to look at here...

-
-
-

Nothing to look at here...

-
-
-
-
-

Accordion Header 1

-
-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-

Accordion Content 1

-
-
-
-

Accordion Header 2

-
-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-

Accordion Content 2

-
-
-
-

Accordion Header 3

-
-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-

Accordion Content 3

-
-
-
-
-
- - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/tabs_tabs.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/tabs_tabs.html deleted file mode 100644 index 3eac065..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/tabs_tabs.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - Compound Visual Test : Tabs in Tabs - - - - - - - - - - - -
- -
-
- -
-

nested tabs a-1

-

nested tabs a-1

-

nested tabs a-1

-

nested tabs a-1

-

nested tabs a-1

-
-
-

nested tabs a-2

-

nested tabs a-2

-

nested tabs a-2

-

nested tabs a-2

-

nested tabs a-2

-
-
-
-
-
- -
-

nested tabs b-1

-

nested tabs b-1

-

nested tabs b-1

-

nested tabs b-1

-

nested tabs b-1

-
-
-

nested tabs b-2

-

nested tabs b-2

-

nested tabs b-2

-

nested tabs b-2

-

nested tabs b-2

-
-
-
-
- - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/tabs_tooltips.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/tabs_tooltips.html deleted file mode 100644 index 680b6bc..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/visual/compound/tabs_tooltips.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Compound Visual Test : Tabs in Tabs - - - - - - - - - - - - -
- -
- label -
- -
- - - -- cgit v1.2.2