[limb-svn] r6249 - in 3.x/trunk/limb/cms: shared/ext/css shared/ext/images/default/layout shared/styles src/model template/_cms template/admin template/admin_documents template/admin_navigation template/admin_tree template/admin_user
svn at limb-project.com
svn at limb-project.com
Fri Aug 31 11:59:34 MSD 2007
Author: serega
Date: 2007-08-31 11:59:33 +0400 (Fri, 31 Aug 2007)
New Revision: 6249
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6249
Modified:
3.x/trunk/limb/cms/shared/ext/css/layout.css
3.x/trunk/limb/cms/shared/ext/images/default/layout/collapse.gif
3.x/trunk/limb/cms/shared/ext/images/default/layout/expand.gif
3.x/trunk/limb/cms/shared/styles/cp.css
3.x/trunk/limb/cms/src/model/lmbCmsSessionUser.class.php
3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php
3.x/trunk/limb/cms/src/model/lmbCmsUserRoles.class.php
3.x/trunk/limb/cms/template/_cms/extjs.html
3.x/trunk/limb/cms/template/_cms/js.html
3.x/trunk/limb/cms/template/_cms/menu.html
3.x/trunk/limb/cms/template/_cms/page.html
3.x/trunk/limb/cms/template/_cms/popup.html
3.x/trunk/limb/cms/template/_cms/styles.html
3.x/trunk/limb/cms/template/admin/display.html
3.x/trunk/limb/cms/template/admin_documents/create.html
3.x/trunk/limb/cms/template/admin_documents/delete.html
3.x/trunk/limb/cms/template/admin_documents/display.html
3.x/trunk/limb/cms/template/admin_documents/edit.html
3.x/trunk/limb/cms/template/admin_documents/form_fields.html
3.x/trunk/limb/cms/template/admin_navigation/create.html
3.x/trunk/limb/cms/template/admin_navigation/delete.html
3.x/trunk/limb/cms/template/admin_navigation/display.html
3.x/trunk/limb/cms/template/admin_navigation/edit.html
3.x/trunk/limb/cms/template/admin_navigation/form_fields.html
3.x/trunk/limb/cms/template/admin_tree/create_node.html
3.x/trunk/limb/cms/template/admin_tree/delete.html
3.x/trunk/limb/cms/template/admin_tree/display.html
3.x/trunk/limb/cms/template/admin_tree/edit_node.html
3.x/trunk/limb/cms/template/admin_tree/index.html
3.x/trunk/limb/cms/template/admin_tree/move.html
3.x/trunk/limb/cms/template/admin_user/change_password.html
3.x/trunk/limb/cms/template/admin_user/create.html
3.x/trunk/limb/cms/template/admin_user/delete.html
3.x/trunk/limb/cms/template/admin_user/display.html
3.x/trunk/limb/cms/template/admin_user/edit.html
Log:
-- some further improvements in templates of CMS package.
-- fixed some errors in model classes of CMS package.
Modified: 3.x/trunk/limb/cms/shared/ext/css/layout.css
===================================================================
--- 3.x/trunk/limb/cms/shared/ext/css/layout.css 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/shared/ext/css/layout.css 2007-08-31 07:59:33 UTC (rev 6249)
@@ -2,7 +2,7 @@
* Ext JS Library 1.0.1
* Copyright(c) 2006-2007, Ext JS, LLC.
* licensing at extjs.com
- *
+ *
* http://www.extjs.com/license
*/
@@ -12,7 +12,7 @@
overflow:hidden;
}
.x-layout-container .x-layout-tabs-body{
- border:0 none;
+ border:0 none;
}
.x-layout-collapsed{
position:absolute;
@@ -23,8 +23,8 @@
width:20px;
height:20px;
overflow:hidden;
- z-index:20;
- border:1px solid #bbb;
+ z-index:20;
+ border:1px solid #bbb;
}
.ext-border-box .x-layout-collapsed{
width:22px;
@@ -32,17 +32,17 @@
}
.x-layout-collapsed-over{
cursor:pointer;
- background-color:#eee;
+ background-color:#eee;
}
.x-layout-collapsed-west .x-layout-collapsed-tools, .x-layout-collapsed-east .x-layout-collapsed-tools{
- position:absolute;
+ position:absolute;
top:0;
left:0;
width:20px;
height:20px;
}
.x-layout-collapsed-north .x-layout-collapsed-tools, .x-layout-collapsed-south .x-layout-collapsed-tools{
- position:absolute;
+ position:absolute;
top:0;
right:0;
width:20px;
@@ -102,7 +102,7 @@
padding: 4px;
padding-left: 4px;
display:block;
- white-space:nowrap;
+ white-space:nowrap;
}
.x-layout-panel-hd-tools{
position:absolute;
@@ -136,10 +136,10 @@
background-image:url(../images/default/layout/stick.gif);
}
.x-layout-collapse-west,.x-layout-expand-east{
- background-image:url(../../images/_cp/icon/collapse.gif);
+ background-image:url(../images/default/layout/collapse.gif);
}
.x-layout-expand-west,.x-layout-collapse-east{
- background-image:url(../../images/_cp/icon/expand.gif);
+ background-image:url(../images/default/layout/expand.gif);
}
.x-layout-collapse-north,.x-layout-expand-south{
background-image:url(../images/default/layout/ns-collapse.gif);
@@ -163,21 +163,21 @@
overflow:auto;height:100%;
}
.x-layout-component-panel, .x-layout-nested-layout {
- position:relative;
+ position:relative;
padding:0;
- overflow:hidden;
- width:200px;
- height:200px;
+ overflow:hidden;
+ width:200px;
+ height:200px;
}
.x-layout-nested-layout .x-layout-panel {
- border:0 none;
+ border:0 none;
}
.x-layout-nested-layout .x-layout-panel-north {
}
.x-layout-nested-layout .x-layout-panel-south {
}
.x-layout-nested-layout .x-layout-panel-east {
- border-left:1px solid #98c0f4;
+ border-left:1px solid #98c0f4;
}
.x-layout-nested-layout .x-layout-panel-west {
}
@@ -185,34 +185,34 @@
.x-layout-panel-dragover {
}
.x-layout-panel-proxy {
- background-image: url(../images/default/layout/gradient-bg.gif);
- z-index:10001;
- overflow:hidden;
- position:absolute;
- left:0;top:0;
+ background-image: url(../images/default/layout/gradient-bg.gif);
+ z-index:10001;
+ overflow:hidden;
+ position:absolute;
+ left:0;top:0;
}
.x-layout-slider {
- z-index:15;
- overflow:hidden;
- position:absolute;
+ z-index:15;
+ overflow:hidden;
+ position:absolute;
}
.x-scroller-up, .x-scroller-down {
- cursor:pointer;
- overflow:hidden;
- line-height:16px;
+ cursor:pointer;
+ overflow:hidden;
+ line-height:16px;
}
.x-scroller-down {
}
.x-scroller-btn-over {
- background-color: #d9e8f8;
+ background-color: #d9e8f8;
}
.x-scroller-btn-click {
- background-color: #AECEF7;
+ background-color: #AECEF7;
}
.x-scroller-btn-disabled {
- cursor:default;
- -moz-opacity: 0.3;
+ cursor:default;
+ -moz-opacity: 0.3;
opacity:.30;
filter: alpha(opacity=30);
}
Modified: 3.x/trunk/limb/cms/shared/ext/images/default/layout/collapse.gif
===================================================================
(Binary files differ)
Modified: 3.x/trunk/limb/cms/shared/ext/images/default/layout/expand.gif
===================================================================
(Binary files differ)
Modified: 3.x/trunk/limb/cms/shared/styles/cp.css
===================================================================
--- 3.x/trunk/limb/cms/shared/styles/cp.css 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/shared/styles/cp.css 2007-08-31 07:59:33 UTC (rev 6249)
@@ -60,10 +60,10 @@
/*Misc*/
.attention {background: #dff6dd;border:1px solid #c4e4b1;margin:10px 0 25px;padding:13px 16px;position:relative;clear:both}
- .attention span {background: url(../images/_cp/icon/close.gif) no-repeat right center;position:absolute;right:16px;padding:0 16px 0 0;}
+ .attention span {background: url(../images/icon/close.gif) no-repeat right center;position:absolute;right:16px;padding:0 16px 0 0;}
.breadcrumbs {clear:both;margin:5px 0;}
.clearing {height:0;clear: both;padding:0;font-size:0;}
- .create {background: url(../images/_cp/bgr/create.gif) no-repeat left center;padding:3px 0 0px 25px;float:left}
+ .create {background: url(../images/bgr/create.gif) no-repeat left center;padding:3px 0 0px 25px;float:left}
.popup .create {float:none;margin:10px 0 0;display:block}
.edit_mode {float:left;}
.edit_mode label {vertical-align:top}
@@ -71,10 +71,10 @@
.right_col {float:right;width:50%}
.line {margin:3px 0;}
.liquid_right {float:left;margin:0 10px 3px 0;}
- .no {background: url(../images/_cp/marker/no.gif) no-repeat left bottom;padding:0 0 3px 20px;}
+ .no {background: url(../images/marker/no.gif) no-repeat left bottom;padding:0 0 3px 20px;}
.magnifier {background: #fff;display:block;position:relative;width:13px;height:13px;padding:3px;margin:0 0 -16px 0;opacity:.70;filter: alpha(opacity=70); -moz-opacity: 0.7;}
.width100 {width:100%}
- .yes {background: url(../images/_cp/marker/yes.gif) no-repeat left top;padding:3px 0 0 20px;}
+ .yes {background: url(../images/marker/yes.gif) no-repeat left top;padding:3px 0 0 20px;}
/*MESSAGE ERROR*/
.message_error {margin:0 15px -40px;}
@@ -86,25 +86,25 @@
/*BOOKMARKS*/
.bookmarks {list-style:none;margin:0 0 0 24px;padding:10px 0 0 0;}
- .bookmarks li {background:#eeeeee url(../images/_cp/bgr/bookmarks/left.gif) no-repeat left top;float:left;margin:0 2px 0 0;padding:0;height:23px;cursor:pointer}
- .bookmarks a {background:url(../images/_cp/bgr/bookmarks/right.gif) no-repeat right top;padding:3px 15px 4px;display:block;}
- .bookmarks .active {background:#7d7d7d url(../images/_cp/bgr/bookmarks/current_left.gif) no-repeat left top;}
- .bookmarks .active a {background:url(../images/_cp/bgr/bookmarks/current_right.gif) no-repeat right top;}
+ .bookmarks li {background:#eeeeee url(../images/bgr/bookmarks/left.gif) no-repeat left top;float:left;margin:0 2px 0 0;padding:0;height:23px;cursor:pointer}
+ .bookmarks a {background:url(../images/bgr/bookmarks/right.gif) no-repeat right top;padding:3px 15px 4px;display:block;}
+ .bookmarks .active {background:#7d7d7d url(../images/bgr/bookmarks/current_left.gif) no-repeat left top;}
+ .bookmarks .active a {background:url(../images/bgr/bookmarks/current_right.gif) no-repeat right top;}
.bookmarks_content {border:1px solid #ddd;border-top:3px solid #7d7d7d;border-bottom:0px;min-height:320px;clear:both;margin:0 15px 0;padding:10px 10px 1px;overflow:hidden}
*html .bookmarks_content {height:335px;}
.bookmarks_content .left_side {width:400px;float:left;}
.bookmarks_content .right_side {width:400px;float:right;}
/*BORDER*/
- .border_h {background: url(../images/_cp/bgr/border/hor.gif) repeat-x left top;display:block;height:4px;font-size:0;margin-top:5px;}
- .border_h .l {background: url(../images/_cp/bgr/border/lt.gif) no-repeat left top;float:left;width:4px;height:4px}
- .border_h .r {background: url(../images/_cp/bgr/border/rt.gif) no-repeat left top;float:right;width:4px;height:4px}
- .border_c {background: url(../images/_cp/bgr/border/ver.gif) repeat-y left top;padding-left: 9px;}
- .border_c .content {background: url(../images/_cp/bgr/border/ver.gif) repeat-y right top;padding: 0 9px 14px 0;;}
+ .border_h {background: url(../images/bgr/border/hor.gif) repeat-x left top;display:block;height:4px;font-size:0;margin-top:5px;}
+ .border_h .l {background: url(../images/bgr/border/lt.gif) no-repeat left top;float:left;width:4px;height:4px}
+ .border_h .r {background: url(../images/bgr/border/rt.gif) no-repeat left top;float:right;width:4px;height:4px}
+ .border_c {background: url(../images/bgr/border/ver.gif) repeat-y left top;padding-left: 9px;}
+ .border_c .content {background: url(../images/bgr/border/ver.gif) repeat-y right top;padding: 0 9px 14px 0;;}
.border_c .content .title {background: #fff;position:relative;top:-11px;display:inline;padding:0 3px;color:#0c4ea6}
- .border_b {background: url(../images/_cp/bgr/border/hor.gif) repeat-x left bottom;display:block;height:4px;font-size:0;margin-bottom:20px}
- .border_b .l {background: url(../images/_cp/bgr/border/lb.gif) no-repeat left top;float:left;width:4px;height:4px;}
- .border_b .r {background: url(../images/_cp/bgr/border/rb.gif) no-repeat left top;float:right;width:4px;height:4px}
+ .border_b {background: url(../images/bgr/border/hor.gif) repeat-x left bottom;display:block;height:4px;font-size:0;margin-bottom:20px}
+ .border_b .l {background: url(../images/bgr/border/lb.gif) no-repeat left top;float:left;width:4px;height:4px;}
+ .border_b .r {background: url(../images/bgr/border/rb.gif) no-repeat left top;float:right;width:4px;height:4px}
/*PAGER*/
.pager {height:19px;font:1.1em Arial;color:#7d7d7d;margin:10px 0;float:right}
@@ -116,20 +116,20 @@
/*layout*/
/*TOP*/
- #top {background: url(../images/_cp/bgr/header.gif) repeat left top;width:100%;float:left;}
+ #top {background: url(../images/bgr/header.gif) repeat left top;width:100%;float:left;}
#top #logo {margin:5px 0 8px 60px;float:left;}
- #top .jip_button {background: url(../images/_cp/marker/jip.gif) no-repeat left center;float:left;margin:7px 0 0 75px;padding:2px 0 4px 22px}
+ #top .jip_button {background: url(../images/marker/jip.gif) no-repeat left center;float:left;margin:7px 0 0 75px;padding:2px 0 4px 22px}
#top #user_data {float:right;margin:0 15px 0;}
- #top #user_data .name, #top #user_data .profile {background: url(../images/_cp/bgr/user_data.gif) repeat-y right top;float:left;margin:0 5px;padding:8px 14px 10px;}
+ #top #user_data .name, #top #user_data .profile {background: url(../images/bgr/user_data.gif) repeat-y right top;float:left;margin:0 5px;padding:8px 14px 10px;}
#top #user_data .logout {float:left;padding:8px 0 10px 0;}
/*DASHBOARD*/
#dashboard {border:1px solid #ddd;border-top:3px solid #7d7d7d;margin:25px 15px 20px 20px;padding:1px 10px 1px;overflow:hidden}
- #dashboard h2 {background: url(../images/_cp/bgr/dashboard.section.gif) repeat left top;padding:0;margin:0 0 0 0;}
- #dashboard h2 span {background: url(../images/_cp/bgr/dashboard.section.right.gif) no-repeat right top;display:block;margin:0;padding:10px 7px 5px;}
+ #dashboard h2 {background: url(../images/bgr/dashboard.section.gif) repeat left top;padding:0;margin:0 0 0 0;}
+ #dashboard h2 span {background: url(../images/bgr/dashboard.section.right.gif) no-repeat right top;display:block;margin:0;padding:10px 7px 5px;}
#dashboard .section {border:1px solid #e4e2e2;border-top:0 none;padding:10px 7px 20px;margin:0 0 20px 0}
- #dashboard .add {background: url(../images/_cp/bgr/create.gif) no-repeat left center;padding:3px 0 0px 25px;margin-bottom:10px;display:block}
+ #dashboard .add {background: url(../images/bgr/create.gif) no-repeat left center;padding:3px 0 0px 25px;margin-bottom:10px;display:block}
/*HEADER CONTEXT*/
@@ -139,8 +139,8 @@
/*FILTER*/
#filter {overflow:hidden;clear:both;margin:0 -10px;}
*html #filter {height:1%}
- .active_filter {background: url(../images/_cp/bgr/filter_border.gif) no-repeat left top;float:right;margin-right:10px;cursor:pointer;}
- .active_filter span {background: url(../images/_cp/bgr/filter_arrow.gif) no-repeat right top;padding:.2em 17px 0.2em 6px;display:block}
+ .active_filter {background: url(../images/bgr/filter_border.gif) no-repeat left top;float:right;margin-right:10px;cursor:pointer;}
+ .active_filter span {background: url(../images/bgr/filter_arrow.gif) no-repeat right top;padding:.2em 17px 0.2em 6px;display:block}
.filter {border-top:1px solid #ddd;margin:0;padding:15px 10px 0;display:none;clear:both}
*html .filter {height:1%}
.filter .input {width:12em;margin-right:3px}
@@ -170,18 +170,18 @@
/*LOGIN FORM*/
- #login_form {background:#d9d9d9 url(../images/_cp/bgr/admin.gif) repeat-x left top;}
+ #login_form {background:#d9d9d9 url(../images/bgr/admin.gif) repeat-x left top;}
#login_wrapper {position:absolute;left:50%;top:30%;margin:0 0 0 -200px;height:270px}
- #login_form .shadow_l {background: url(../images/_cp/bgr/shadow/login_l.png) no-repeat left top;width:19px}
- *html #login_form .shadow_l {background:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='../images/_cp/bgr/shadow/login_l.png');}
- #login_form .shadow_r {background: url(../images/_cp/bgr/shadow/login_r.png) no-repeat left top;width:19px;}
- *html #login_form .shadow_r {background:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='../images/_cp/bgr/shadow/login_r.png');}
- #login_form .shadow_b {background: url(../images/_cp/bgr/shadow/login_b.png) repeat-x right top;height:13px;width:19px}
- *html #login_form .shadow_b {background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=scale,src='../images/_cp/bgr/shadow/login_b.png');}
- #login_form .shadow_rb {background: url(../images/_cp/bgr/shadow/login_rb.png) no-repeat right top;height:13px;width:19px}
- *html #login_form .shadow_rb {background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=image,src='../images/_cp/bgr/shadow/login_rb.png');}
- #login_form .shadow_lb {background: url(../images/_cp/bgr/shadow/login_lb.png) no-repeat;background-position:right top;width:19px;}
- *html #login_form .shadow_lb {background-image:none;background-position:right top;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='../images/_cp/bgr/shadow/login_lb.png');}
+ #login_form .shadow_l {background: url(../images/bgr/shadow/login_l.png) no-repeat left top;width:19px}
+ *html #login_form .shadow_l {background:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='../images/bgr/shadow/login_l.png');}
+ #login_form .shadow_r {background: url(../images/bgr/shadow/login_r.png) no-repeat left top;width:19px;}
+ *html #login_form .shadow_r {background:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='../images/bgr/shadow/login_r.png');}
+ #login_form .shadow_b {background: url(../images/bgr/shadow/login_b.png) repeat-x right top;height:13px;width:19px}
+ *html #login_form .shadow_b {background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=scale,src='../images/bgr/shadow/login_b.png');}
+ #login_form .shadow_rb {background: url(../images/bgr/shadow/login_rb.png) no-repeat right top;height:13px;width:19px}
+ *html #login_form .shadow_rb {background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=image,src='../images/bgr/shadow/login_rb.png');}
+ #login_form .shadow_lb {background: url(../images/bgr/shadow/login_lb.png) no-repeat;background-position:right top;width:19px;}
+ *html #login_form .shadow_lb {background-image:none;background-position:right top;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='../images/bgr/shadow/login_lb.png');}
#login_form .content {background:#fff;padding:1px 10px 0 10px;vertical-align:top;}
#login_form label {display:block;float:none}
#login_form .input {background:#f3f4f5;border:1px solid #717171;width:10em;height:21px;vertical-align:bottom;font:bold 1.3em Arial;letter-spacing:0.5px}
@@ -195,23 +195,23 @@
/*MENU*/
#main_menu {margin:20px 0 0 15px;}
- #main_menu dt {background: url(../images/_cp/menu/bg.gif) no-repeat left top;margin-bottom:2px;cursor:pointer;}
- #main_menu dt.current {background: url(../images/_cp/menu/current.gif) no-repeat left top;}
+ #main_menu dt {background: url(../images/menu/bg.gif) no-repeat left top;margin-bottom:2px;cursor:pointer;}
+ #main_menu dt.current {background: url(../images/menu/current.gif) no-repeat left top;}
#main_menu span {display:block;padding:4px 10px 4px 28px}
- #main_menu .content span{background: url(../images/_cp/menu/content.gif) no-repeat 7px center;}
- #main_menu .content.current span{background: url(../images/_cp/menu/content_current.gif) no-repeat 7px center;}
- #main_menu .interactive span{background: url(../images/_cp/menu/interactive.gif) no-repeat 7px center;}
- #main_menu .interactive.current span{background: url(../images/_cp/menu/interactive_current.gif) no-repeat 7px center;}
- #main_menu .guests span{background: url(../images/_cp/menu/guests.gif) no-repeat 8px center;}
- #main_menu .guests.current span{background: url(../images/_cp/menu/guests_current.gif) no-repeat 8px center;}
- #main_menu .other span{background: url(../images/_cp/menu/other.gif) no-repeat 7px center;}
- #main_menu .other.current span{background: url(../images/_cp/menu/other_current.gif) no-repeat 7px center;}
- #main_menu .banners span{background: url(../images/_cp/menu/banners.gif) no-repeat 7px center;}
+ #main_menu .content span{background: url(../images/menu/content.gif) no-repeat 7px center;}
+ #main_menu .content.current span{background: url(../images/menu/content_current.gif) no-repeat 7px center;}
+ #main_menu .interactive span{background: url(../images/menu/interactive.gif) no-repeat 7px center;}
+ #main_menu .interactive.current span{background: url(../images/menu/interactive_current.gif) no-repeat 7px center;}
+ #main_menu .guests span{background: url(../images/menu/guests.gif) no-repeat 8px center;}
+ #main_menu .guests.current span{background: url(../images/menu/guests_current.gif) no-repeat 8px center;}
+ #main_menu .other span{background: url(../images/menu/other.gif) no-repeat 7px center;}
+ #main_menu .other.current span{background: url(../images/menu/other_current.gif) no-repeat 7px center;}
+ #main_menu .banners span{background: url(../images/menu/banners.gif) no-repeat 7px center;}
#main_menu ul {list-style-type:none;margin:0 0 0 21px;padding:0;}
#main_menu li {margin-bottom:3px}
#main_menu li a {display:block;padding:3px 0 4px 7px;}
- #main_menu li.current {background: url(../images/_cp/menu/sub_current.gif) no-repeat left top;}
- #main_menu li.current a {background: url(../images/_cp/menu/sub_current_bottom.gif) no-repeat left bottom;}
+ #main_menu li.current {background: url(../images/menu/sub_current.gif) no-repeat left top;}
+ #main_menu li.current a {background: url(../images/menu/sub_current_bottom.gif) no-repeat left bottom;}
@@ -229,11 +229,11 @@
.fields .calendar {margin:0 25px 0 5px;}
- input[type='text'], .input{background:#fff url(../images/_cp/bgr/text-bg.gif) repeat-x top left;border: 1px solid #B5B8C8;height:1.9em;padding:2px 3px 0;}
+ input[type='text'], .input{background:#fff url(../images/bgr/text-bg.gif) repeat-x top left;border: 1px solid #B5B8C8;height:1.9em;padding:2px 3px 0;}
.req {font:8pt Tahoma, sans;text-align:right;padding: 12px 10px 0 0 ; height:35px}
- select {background: url(../images/_cp/bgr/text-bg.gif) repeat-x top left;border: 1px solid #B5B8C8;height:1.9em;padding:2px 0 0 0;}
+ select {background: url(../images/bgr/text-bg.gif) repeat-x top left;border: 1px solid #B5B8C8;height:1.9em;padding:2px 0 0 0;}
select option {background:#fff;}
- textArea {background:#fff url(../images/_cp/bgr/text-bg.gif) repeat-x top left;border: 1px solid #B5B8C8;}
+ textArea {background:#fff url(../images/bgr/text-bg.gif) repeat-x top left;border: 1px solid #B5B8C8;}
.form-errors .title {color:#bd1a01;font-weight:bold}
Modified: 3.x/trunk/limb/cms/src/model/lmbCmsSessionUser.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsSessionUser.class.php 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsSessionUser.class.php 2007-08-31 07:59:33 UTC (rev 6249)
@@ -8,6 +8,7 @@
*/
lmb_require('limb/core/src/lmbObject.class.php');
lmb_require('limb/active_record/src/lmbActiveRecord.class.php');
+lmb_require('limb/cms/src/model/lmbCmsUser.class.php');
/**
* class lmbCmsClassName.
@@ -33,7 +34,7 @@
$this->user->setLoggedIn($this->is_logged_in);
}
else
- $this->user = new rtUser();
+ $this->user = new lmbCmsUser();
return $this->user;
}
Modified: 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php 2007-08-31 07:59:33 UTC (rev 6249)
@@ -6,7 +6,7 @@
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
-lmb_require('src/model/rtRoles.class.php');
+lmb_require('limb/cms/src/model/lmbCmsUserRoles.class.php');
/**
* class lmbCmsUser.
@@ -129,7 +129,13 @@
function getCurrentRole()
{
- return lmbCmsUserRoles :: createRole($this->getRoleId());
+ if($role_id = $this->getRoleId())
+ return lmbCmsUserRoles :: createRole($role_id);
+ else
+ {
+ $this->setRoleId(lmbCmsUserRoles :: ADMIN);
+ return lmbCmsUserRoles :: createRole(lmbCmsUserRoles :: ADMIN);
+ }
}
function getIsAdmin()
Modified: 3.x/trunk/limb/cms/src/model/lmbCmsUserRoles.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsUserRoles.class.php 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsUserRoles.class.php 2007-08-31 07:59:33 UTC (rev 6249)
@@ -7,6 +7,7 @@
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
+lmb_require('limb/cms/src/model/lmbCmsUserRole.class.php');
/**
* class lmbCmsUserRoles.
*
@@ -36,12 +37,12 @@
function createAdminRole()
{
- return new rtRole(self :: ADMIN, 'Администратор', 'Админ');
+ return new lmbCmsUserRole(self :: ADMIN, 'Администратор', 'Админ');
}
function createEditorRole()
{
- return new rtRole(self :: EDITOR, 'Редактор', 'Ред');
+ return new lmbCmsUserRole(self :: EDITOR, 'Редактор', 'Ред');
}
function getRoles()
Modified: 3.x/trunk/limb/cms/template/_cms/extjs.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/extjs.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/_cms/extjs.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -1,7 +1,7 @@
- <link rel="stylesheet" type="text/css" href="/ext/css/tabs.css"/>
- <link rel="stylesheet" type="text/css" href="/ext/css/layout.css"/>
- <link rel="stylesheet" type="text/css" href="/ext/css/basic-dialog.css"/>
+ <link rel="stylesheet" type="text/css" href="/shared/cms/ext/css/tabs.css"/>
+ <link rel="stylesheet" type="text/css" href="/shared/cms/ext/css/layout.css"/>
+ <link rel="stylesheet" type="text/css" href="/shared/cms/ext/css/basic-dialog.css"/>
- <script type="text/javascript" src="/ext/jquery-plugins.js"></script>
- <script type="text/javascript" src="/ext/ext-jquery-adapter.js"></script>
- <script type="text/javascript" src="/ext/ext-all.js"></script>
+ <script type="text/javascript" src="/shared/cms/ext/jquery-plugins.js"></script>
+ <script type="text/javascript" src="/shared/cms/ext/ext-jquery-adapter.js"></script>
+ <script type="text/javascript" src="/shared/cms/ext/ext-all.js"></script>
Modified: 3.x/trunk/limb/cms/template/_cms/js.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/js.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/_cms/js.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -6,6 +6,6 @@
<script src="/shared/js/js/limb/forms.js"></script>
<script src="/shared/js/js/limb/form_elements.js"></script>
<script src="/shared/js/js/limb/auto_popup.js"></script>
-<script type="text/javascript" src="/js/tabs.js"></script>
+<script type="text/javascript" src="/shared/cms/js/tabs.js"></script>
-<script src="/js/cp.js"></script>
+<script src="/shared/cms/js/cp.js"></script>
Modified: 3.x/trunk/limb/cms/template/_cms/menu.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/menu.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/_cms/menu.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -1,4 +1,4 @@
-<fetch using='src/fetcher/AdminNavigationFetcher' target='navigation' />
+<fetch using='limb/cms/src/fetcher/lmbCmsAdminNavigationFetcher' target='navigation' />
<dl id='main_menu'>
<list:list id='navigation'>
Modified: 3.x/trunk/limb/cms/template/_cms/page.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/page.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/_cms/page.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -6,10 +6,10 @@
<title>{$#title}</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
- <core:INCLUDE file='_cp/styles.html'/>
- <core:INCLUDE file='_cp/js.html'/>
- <core:INCLUDE file='_cp/extjs.html'/>
- <script type="text/javascript" src="/js/accordion.js"></script>
+ <core:INCLUDE file='_cms/styles.html'/>
+ <core:INCLUDE file='_cms/js.html'/>
+ <core:INCLUDE file='_cms/extjs.html'/>
+ <script type="text/javascript" src="/shared/cms/js/accordion.js"></script>
<script type="text/javascript">
cpLayout = function(){
return {
@@ -21,7 +21,7 @@
});
layout.beginUpdate();
- layout.add('west', new Ext.ContentPanel('left', {title: 'Навигация', fitToFrame:true, closable:false}));
+ layout.add('west', new Ext.ContentPanel('left', {title: 'Navigation', fitToFrame:true, closable:false}));
layout.add('center', new Ext.ContentPanel('center'));
layout.add('north', new Ext.ContentPanel('top'));
layout.endUpdate();
@@ -41,9 +41,6 @@
<div id='top'>
<img src="/shared/cms/images/limb_admin.gif" width='94' height='25' alt='LIMB' id='logo'/>
<core:datasource from='#toolkit.user'>
- <core:default for='is_admin'>
- <route_url params='controller:admin_publishing,action:main_page' class="jip_button">Редактировать на сайте</route_url>
- </core:default>
<div id='user_data'>
<span class='name'>{$login} [ {$full_name} ]</span> <a href="#" class='profile'>Мой профиль</a> <a href='/user/logout' class='logout'>Выйти</a>
@@ -59,7 +56,7 @@
<!--END:[ body ]-->
<div id='left'>
- <core:INCLUDE file='_cp/menu.html'/>
+ <core:INCLUDE file='_cms/menu.html'/>
</div>
</body>
</html>
Modified: 3.x/trunk/limb/cms/template/_cms/popup.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/popup.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/_cms/popup.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -3,9 +3,9 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<core:INCLUDE file='_cp/styles.html'/>
-<core:INCLUDE file='_cp/js.html'/>
-<core:INCLUDE file='_cp/extjs.html'/>
+<core:INCLUDE file='_cms/styles.html'/>
+<core:INCLUDE file='_cms/js.html'/>
+<core:INCLUDE file='_cms/extjs.html'/>
</head>
<body class='popup'>
<core:PLACEHOLDER id="icon"/>
Modified: 3.x/trunk/limb/cms/template/_cms/styles.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/styles.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/_cms/styles.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -1,2 +1,2 @@
-<link rel="stylesheet" type="text/css" href="/styles/cp.css" />
+<link rel="stylesheet" type="text/css" href="/shared/cms/styles/cp.css" />
Modified: 3.x/trunk/limb/cms/template/admin/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin/display.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin/display.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -1,9 +1,9 @@
<core:wrap file="_cms/page.html" in="content_zone">
<div id="dashboard">
- <h1>Панель управления</h1>
+ <h1>Control panel</h1>
- <p><b>Добро пожаловать в панель управления сайтом.</b></p>
+ <p><b>Wellcome to control panel</b></p>
- <p><b>Выберите модуль, с которым вы будете работать, в левой части экрана.</b></p>
+ <p><b>Please select a module you want to work with in the left menu.</b></p>
</div>
</core:wrap>
Modified: 3.x/trunk/limb/cms/template/admin_documents/create.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_documents/create.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_documents/create.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -4,11 +4,11 @@
<h1>Создать страницу</h1>
- <core:include file='_cp/form_errors.html'/>
+ <core:include file='_cms/form_errors.html'/>
<core:include file='admin_documents/form_fields.html'/>
- <core:include file='_cp/create_common_elements.html'/>
+ <core:include file='_cms/create_common_elements.html'/>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_documents/delete.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_documents/delete.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_documents/delete.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -12,7 +12,7 @@
<table>
<tr>
- <th class='selector'><core:INCLUDE file='_cp/selector.html'></th>
+ <th class='selector'><core:INCLUDE file='_cms/selector.html'></th>
<th>Заголовок</th>
</tr>
<list:list id='items_to_delete'>
@@ -25,7 +25,7 @@
</list:LIST>
</table>
- <core:include file='_cp/delete_common_elements.html'/>
+ <core:include file='_cms/delete_common_elements.html'/>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_documents/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_documents/display.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_documents/display.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -29,11 +29,11 @@
<fetch:params order='node.priority=DESC'/>
</active_record:fetch>
- <core:include file='_cp/node_breadcrumbs.html'>
+ <core:include file='_cms/node_breadcrumbs.html'>
- <core:include file='_cp/pager.html'/>
+ <core:include file='_cms/pager.html'/>
- <core:INCLUDE file='_cp/notify_zone.html'/>
+ <core:INCLUDE file='_cms/notify_zone.html'/>
<core:include file='admin_documents/filter_form.html' />
@@ -50,7 +50,7 @@
<table>
<tr>
- <th class='selector'><core:INCLUDE file='_cp/selector.html'></th>
+ <th class='selector'><core:INCLUDE file='_cms/selector.html'></th>
<th>#ID</th>
<th class='orders'>Порядок</th>
<th width='100%'>Страница</th>
Modified: 3.x/trunk/limb/cms/template/admin_documents/edit.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_documents/edit.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_documents/edit.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -6,7 +6,7 @@
<core:include file='admin_documents/form_fields.html'/>
- <core:include file='_cp/edit_common_elements.html'/>
+ <core:include file='_cms/edit_common_elements.html'/>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_documents/form_fields.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_documents/form_fields.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_documents/form_fields.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -1,4 +1,4 @@
-<core:include file='_cp/form_errors.html'/>
+<core:include file='_cms/form_errors.html'/>
<ul class="bookmarks">
<li id='properties_link'><a>Свойства</a></li>
Modified: 3.x/trunk/limb/cms/template/admin_navigation/create.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_navigation/create.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_navigation/create.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -6,7 +6,7 @@
<core:include file='admin_navigation/form_fields.html'>
- <core:include file='_cp/create_common_elements.html'>
+ <core:include file='_cms/create_common_elements.html'>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_navigation/delete.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_navigation/delete.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_navigation/delete.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -25,7 +25,7 @@
</list:LIST>
</table>
- <core:include file='_cp/delete_common_elements.html'>
+ <core:include file='_cms/delete_common_elements.html'>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_navigation/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_navigation/display.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_navigation/display.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -14,9 +14,9 @@
<route_url params="action:create" extra='?popup=1&parent={$id}' alt='Создать элемент навигации' title='Создать элемент навигации' class='create'>Создать элемент навигации</route_url>
</div>
- <core:INCLUDE file='_cp/notify_zone.html'/>
+ <core:INCLUDE file='_cms/notify_zone.html'/>
- <core:include file='_cp/node_breadcrumbs.html'>
+ <core:include file='_cms/node_breadcrumbs.html'>
</div>
Modified: 3.x/trunk/limb/cms/template/admin_navigation/edit.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_navigation/edit.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_navigation/edit.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -6,7 +6,7 @@
<core:include file='admin_navigation/form_fields.html'>
- <core:include file='_cp/edit_common_elements.html'>
+ <core:include file='_cms/edit_common_elements.html'>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_navigation/form_fields.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_navigation/form_fields.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_navigation/form_fields.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -1,4 +1,4 @@
- <core:INCLUDE file='_cp/form_errors.html'>
+ <core:INCLUDE file='_cms/form_errors.html'>
<ul class="bookmarks">
<li id='properties_link'><a>Свойства</a></li>
Modified: 3.x/trunk/limb/cms/template/admin_tree/create_node.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_tree/create_node.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_tree/create_node.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -4,11 +4,11 @@
<form id='node_form' name='node_form' method='post' runat='server'>
- <core:include file='_cp/form_errors.html'/>
+ <core:include file='_cms/form_errors.html'/>
<core:include file='admin_tree/form_fields.html'/>
- <core:include file='_cp/create_common_elements.html'/>
+ <core:include file='_cms/create_common_elements.html'/>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_tree/delete.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_tree/delete.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_tree/delete.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -12,7 +12,7 @@
<table>
<tr>
- <th class='selector'><core:include file='_cp/selector.html'/></th>
+ <th class='selector'><core:include file='_cms/selector.html'/></th>
<th>Заголовок</th>
</tr>
<list:list id='items_to_delete'>
@@ -25,7 +25,7 @@
</list:LIST>
</table>
- <core:include file='_cp/delete_common_elements.html'/>
+ <core:include file='_cms/delete_common_elements.html'/>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_tree/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_tree/display.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_tree/display.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -34,7 +34,7 @@
<table>
<tr>
- <th class='selector'><core:INCLUDE file='_cp/selector.html'></th>
+ <th class='selector'><core:INCLUDE file='_cms/selector.html'></th>
<th>Заголовок</th>
<th>Идентификатор</th>
<th>Действия</th>
Modified: 3.x/trunk/limb/cms/template/admin_tree/edit_node.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_tree/edit_node.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_tree/edit_node.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -4,11 +4,11 @@
<form id='node_form' name='node_form' method='post' runat='server'>
- <core:include file='_cp/form_errors.html'/>
+ <core:include file='_cms/form_errors.html'/>
<core:include file='admin_tree/form_fields.html'/>
- <core:include file='_cp/edit_common_elements.html'/>
+ <core:include file='_cms/edit_common_elements.html'/>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_tree/index.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_tree/index.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_tree/index.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -22,7 +22,7 @@
<table cellpadding="0" cellspacing="0" class='list'>
<tr class='header'>
- <th><core:include file='_cp/selector.html'/></th>
+ <th><core:include file='_cms/selector.html'/></th>
<th>Title</th>
<th>Identifier</th>
<th>Object</th>
Modified: 3.x/trunk/limb/cms/template/admin_tree/move.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_tree/move.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_tree/move.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -10,11 +10,11 @@
<form id='tree_form' name='tree_form' method='post' runat='server'>
- <core:include file='_cp/parent_select.html'/>
+ <core:include file='_cms/parent_select.html'/>
<table>
<tr>
- <th class='selector'><core:INCLUDE file='_cp/selector.html'></th>
+ <th class='selector'><core:INCLUDE file='_cms/selector.html'></th>
<th>Заголовок</th>
</tr>
<list:list id='items_to_move'>
@@ -27,7 +27,7 @@
</list:LIST>
</table>
- <core:include file='_cp/move_common_elements.html'/>
+ <core:include file='_cms/move_common_elements.html'/>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_user/change_password.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_user/change_password.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_user/change_password.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -8,7 +8,7 @@
<form id='user_form' name='user_form' method='post' runat='server'>
- <core:include file='_cp/form_errors.html'/>
+ <core:include file='_cms/form_errors.html'/>
<div class='bookmarks_content'>
Modified: 3.x/trunk/limb/cms/template/admin_user/create.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_user/create.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_user/create.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -4,11 +4,11 @@
<form id='user_form' name='user_form' method='post' runat='server'>
- <core:include file='_cp/form_errors.html'/>
+ <core:include file='_cms/form_errors.html'/>
<core:include file='admin_user/create_form_fields.html'>
- <core:include file='_cp/create_common_elements.html'/>
+ <core:include file='_cms/create_common_elements.html'/>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_user/delete.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_user/delete.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_user/delete.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -13,7 +13,7 @@
<table>
<tr>
- <th class="selector"><core:INCLUDE file='_cp/selector.html'></th>
+ <th class="selector"><core:INCLUDE file='_cms/selector.html'></th>
<th>Логин</th>
<th>ФИО</th>
</tr>
@@ -28,7 +28,7 @@
</list:LIST>
</table>
- <core:include file='_cp/delete_common_elements.html'>
+ <core:include file='_cms/delete_common_elements.html'>
</form>
Modified: 3.x/trunk/limb/cms/template/admin_user/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_user/display.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_user/display.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -9,7 +9,7 @@
</div>
<active_record:fetch class_path='src/model/rtUser' target="users" order="email=ASC" navigator="pager"/>
- <core:include file='_cp/pager.html'>
+ <core:include file='_cms/pager.html'>
</div>
@@ -23,7 +23,7 @@
</div>
<table>
<tr>
- <th class='selector'><core:INCLUDE file='_cp/selector.html'></th>
+ <th class='selector'><core:INCLUDE file='_cms/selector.html'></th>
<th>#ID</th>
<th>ФИО</th>
<th>Login</th>
Modified: 3.x/trunk/limb/cms/template/admin_user/edit.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_user/edit.html 2007-08-31 07:02:31 UTC (rev 6248)
+++ 3.x/trunk/limb/cms/template/admin_user/edit.html 2007-08-31 07:59:33 UTC (rev 6249)
@@ -4,11 +4,11 @@
<h1>Редактировать пользователя</h1>
- <core:INCLUDE file='_cp/form_errors.html'>
+ <core:INCLUDE file='_cms/form_errors.html'>
<core:include file='admin_user/edit_form_fields.html'>
- <core:include file='_cp/edit_common_elements.html'>
+ <core:include file='_cms/edit_common_elements.html'>
</form>
More information about the limb-svn
mailing list