Peter M. Groen / knowledgetree

Commit f358616369e8183846ef95624f7ada32b82f7da8

Authored by kevin_fourie
1 parent cb10d1b6

Merged in from DEV trunk... 

"KTS-1780"
"On bulk actions that are not 'delete', the user should be in the target directory after the action has completed."
Fixed.

Reviewed By: Jalaloedien Abarahams

KTC-96
"UI defects. "
Fixed. IE6 fixes applied.

Reviewed By: Conrad

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6757 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 109 additions and 54 deletions
plugins/ktcore/KTBulkActions.php
  View file @f358616
... ... @@ -231,6 +231,8 @@ class KTBulkMoveAction extends KTBulkAction {
231 231 $this->sReason = $_REQUEST['data']['reason'];
232 232 $this->iTargetFolderId = $_REQUEST['data']['fFolderId'];
233 233 $this->oTargetFolder = Folder::get($this->iTargetFolderId);
  234 + $_REQUEST['fReturnData'] = '';
  235 + $_REQUEST['fFolderId'] = $this->iTargetFolderId;
234 236  
235 237 // does it exists
236 238 if(PEAR::isError($this->oTargetFolder)) {
... ...
resources/css/kt-ie-icons.css
  View file @f358616
1   -.ktHelp { background: transparent url(../../thirdparty/icon-theme/16x16/apps/help-browser.gif) top left no-repeat; }
  1 +.floatClear
  2 +{
  3 + height: 1px !important;
  4 + margin: 0; border: 0; padding: 0;
  5 + width: 1px;
  6 +}
  7 +
  8 +.ktHelp {
  9 + background: transparent url(../../thirdparty/icon-theme/16x16/apps/help-browser.gif) top left no-repeat;
  10 +}
  11 +
2 12 .ktBlock {
3 13 background: #ffffff url(../../resources/graphics/dashlet_toprepeat.gif) top left repeat-x;
4 14 border: 1px solid #C5C5C5;
... ... @@ -32,63 +42,48 @@
32 42 overflow: auto;
33 43 }
34 44  
35   -.ktActionLink.ktDelete, .ktAction.ktDelete { background-image: url(../../resources/graphics/delete.gif); }
36   -.ktActionLink.ktEdit, .ktAction.ktEdit { background-image: url(../../thirdparty/icon-theme/16x16/actions/document-properties.gif); }
37   -.ktActionLink.ktAddUser, .ktAction.ktAddUser { background-image: url(../../thirdparty/icon-theme/16x16/actions/contact-new.gif); }
38   -.ktActionLink.ktAddGroup, .ktAction.ktAddGroup { background-image: url(../../thirdparty/icon-theme/16x16/actions/group-new.gif); }
39   -.ktActionLink.ktAdd, .ktAction.ktAdd { background-image: url(../../thirdparty/icon-theme/16x16/actions/add.gif); }
40   -.ktActionLink.ktDownload, .ktAction.ktDownload { background-image: url(../../resources/graphics/download.gif); }
41   -.ktActionLink.ktBack, .ktAction.ktBack { background-image: url(../../thirdparty/icon-theme/16x16/actions/back.gif); }
42   -.ktActionLink.ktAllowed, .ktAction.ktAllowed { background-image: url(../../resources/graphics/allowed.gif); }
43   -.ktActionLink.ktDenied, .ktAction.ktDenied { background-image: url(../../resources/graphics/denied.gif); }
44   -.ktActionLink.ktMoveUp, .ktAction.ktMoveUp { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-up.gif); }
45   -.ktActionLink.ktMoveDown, .ktAction.ktMoveDown { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-down.gif); }
46   -.contenttype.office { background-image: url(../../resources/mimetypes/office.gif); }
47   -.contenttype.word { background-image: url(../../resources/mimetypes/word.gif); }
48   -.contenttype.database { background-image: url(../../resources/mimetypes/database.gif); }
49   -.contenttype.excel { background-image: url(../../resources/mimetypes/excel.gif); }
50   -.contenttype.openoffice { background-image: url(../../resources/mimetypes/openoffice.gif); }
51   -.contenttype.pdf { background-image: url(../../resources/mimetypes/pdf.gif); }
52   -.contenttype.image { background-image: url(../../resources/mimetypes/image.gif); }
53   -.contenttype.compressed { background-image: url(../../resources/mimetypes/zip.gif); }
54   -.contenttype.html { background-image: url(../../resources/mimetypes/html.gif); }
  45 +.ktActionLink.ktDelete, .ktAction.ktDelete {
  46 + background-image: url(../../resources/graphics/delete.gif);
  47 +}
55 48  
56   -.contenttype.txt,
57   -.contenttype.text,
58   -.contenttype.unspecified_type { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/text-x-generic.gif); }
59   -.contenttype.folder { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.gif); }
  49 +.ktActionLink.ktEdit, .ktAction.ktEdit {
  50 + background-image: url(../../thirdparty/icon-theme/16x16/actions/document-properties.gif);
  51 +}
60 52  
61   -/* IE is woefully unable to */
62   -#portletbar { width: 200px; }
63   -#portlet-search-text { width: 150px; }
64   -/* #content { padding-left: 220px; } */
  53 +.ktActionLink.ktAddUser, .ktAction.ktAddUser {
  54 + background-image: url(../../thirdparty/icon-theme/16x16/actions/contact-new.gif);
  55 +}
65 56  
66   -#content {
67   - float: left;
68   - padding: 0 25px 0 0;
  57 +.ktActionLink.ktAddGroup, .ktAction.ktAddGroup {
  58 + background-image: url(../../thirdparty/icon-theme/16x16/actions/group-new.gif);
69 59 }
70 60  
71   -#pageBody {
72   - height: 800px;
  61 +.ktActionLink.ktAdd, .ktAction.ktAdd {
  62 + background-image: url(../../thirdparty/icon-theme/16x16/actions/add.gif);
73 63 }
74 64  
75   -.floatClear
76   -{
77   - height: 1px !important;
78   - margin: 0; border: 0; padding: 0;
79   - width: 1px;
  65 +.ktActionLink.ktDownload, .ktAction.ktDownload {
  66 + background-image: url(../../resources/graphics/download.gif);
80 67 }
81 68  
82   -#portletbar .portlet {
83   - background: url(../../resources/graphics/portlet_corner_topleft_collapsed.gif) top left no-repeat;
  69 +.ktActionLink.ktBack, .ktAction.ktBack {
  70 + background-image: url(../../thirdparty/icon-theme/16x16/actions/back.gif);
84 71 }
85 72  
86   -#portletbar .portlet.expanded {
87   - background: url(../../resources/graphics/portlet_corner_topleft.gif) top left no-repeat;
  73 +.ktActionLink.ktAllowed, .ktAction.ktAllowed {
  74 + background-image: url(../../resources/graphics/allowed.gif);
88 75 }
89 76  
90   -#menu_divider {
91   - background: url(../../resources/graphics/menu_divider.gif) top left no-repeat;
  77 +.ktActionLink.ktDenied, .ktAction.ktDenied {
  78 + background-image: url(../../resources/graphics/denied.gif);
  79 +}
  80 +
  81 +.ktActionLink.ktMoveUp, .ktAction.ktMoveUp {
  82 + background-image: url(../../thirdparty/icon-theme/16x16/actions/move-up.gif);
  83 +}
  84 +
  85 +.ktActionLink.ktMoveDown, .ktAction.ktMoveDown {
  86 + background-image: url(../../thirdparty/icon-theme/16x16/actions/move-down.gif);
92 87 }
93 88  
94 89 #content .dashboard_block .action_rollup
... ... @@ -106,17 +101,77 @@
106 101 background-image: url(../graphics/bullet_toggle_close.gif);
107 102 }
108 103  
  104 +.contenttype.office {
  105 + background-image: url(../../resources/mimetypes/office.gif);
  106 +}
  107 +
  108 +.contenttype.word {
  109 + background-image: url(../../resources/mimetypes/word.gif);
  110 +}
109 111  
110   -/* NO CHILD SELECTORS IN IE! */
  112 +.contenttype.database {
  113 + background-image: url(../../resources/mimetypes/database.gif);
  114 +}
111 115  
112   -.kt_treenodes li.treenode a.pathnode
113   -{
  116 +.contenttype.excel {
  117 + background-image: url(../../resources/mimetypes/excel.gif);
  118 +}
  119 +
  120 +.contenttype.openoffice {
  121 + background-image: url(../../resources/mimetypes/openoffice.gif);
  122 +}
  123 +
  124 +.contenttype.pdf {
  125 + background-image: url(../../resources/mimetypes/pdf.gif);
  126 +}
  127 +
  128 +.contenttype.image {
  129 + background-image: url(../../resources/mimetypes/image.gif);
  130 +}
  131 +
  132 +.contenttype.compressed {
  133 + background-image: url(../../resources/mimetypes/zip.gif);
  134 +}
  135 +.contenttype.html { background-image: url(../../resources/mimetypes/html.gif); }
  136 +
  137 +.contenttype.txt, .contenttype.unspecified_type {
  138 + background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/text-x-generic.gif);
  139 +}
  140 +
  141 +.contenttype.folder {
  142 + background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.gif);
  143 +}
  144 +
  145 +#portletbar {
  146 + width: 200px;
  147 +}
  148 +
  149 +#portlet-search-text {
  150 + width: 150px;
  151 +}
  152 +
  153 +#pageBody {
  154 + height: auto;
  155 +}
  156 +
  157 +#portletbar .portlet {
  158 + background: url(../../resources/graphics/portlet_bg_collapsed.gif) top left repeat-x;
  159 +}
  160 +
  161 +#portletbar .portlet.expanded {
  162 + background: url(../../resources/graphics/portlet_bg.gif) top left repeat-x;
  163 +}
  164 +
  165 +#menu_divider {
  166 + background: url(../../resources/graphics/menu_divider.gif) top left no-repeat;
  167 +}
  168 +
  169 +.kt_treenodes li.treenode a.pathnode {
114 170 padding-left: 15px;
115 171 }
116 172  
117 173 .kt_treenodes li.treenode.active a.pathnode {
118   - background: transparent url(../graphics/minus.png) center left no-repeat;
119   -
  174 + background: transparent url(../graphics/minus.png) center left no-repeat;
120 175 }
121 176  
122 177 .kt_treenodes li.treenode.inactive a.pathnode {
... ... @@ -132,8 +187,6 @@
132 187 display: none;
133 188 }
134 189  
135   -.ktBlock .dashboard_block_body
136   -{
137   - margin: 8px 0 10px 1em;
138   - overflow: scroll;
  190 +#navbar {
  191 + margin-right: 5px;
139 192 }
... ...