From 6b581f4c0e7c4cf4017d0598c8c1b0a99dc31e93 Mon Sep 17 00:00:00 2001 From: pete Date: Fri, 13 Jun 2008 20:25:10 +0000 Subject: updated and new stuff pertaining to the customise panel, new jquery also git-svn-id: https://code.elgg.org/elgg/trunk@923 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/canvas/layouts/widgets.php | 55 +- views/default/css.php | 1160 ++++++++++++++++-------------- views/default/navigation/toolbox.php | 147 ++-- views/default/page_elements/header.php | 113 +-- 4 files changed, 772 insertions(+), 703 deletions(-) (limited to 'views/default') diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index 820c41f19..b9227c64a 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -13,42 +13,15 @@ $widgettypes = get_widget_types(); - if (is_array($widgettypes) && sizeof($widgettypes) > 0) { + $owner = page_owner_entity(); + + if (is_array($widgettypes) && sizeof($widgettypes) > 0 && $owner->canEdit()) { ?>
- - - - - - - - - - - diff --git a/views/default/css.php b/views/default/css.php index d1d09599b..8bb14c1e6 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -1,526 +1,634 @@ - - -/* *************************************** - RESET BASE STYLES -*************************************** */ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; -} -/* remember to define focus styles! */ -:focus { - outline: 0; -} -ol, ul { - list-style: none; -} -/* tables still need 'cellspacing="0"' in the markup */ -table { - border-collapse: separate; - border-spacing: 0; -} -caption, th, td { - text-align: left; - font-weight: normal; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ""; -} -blockquote, q { - quotes: "" ""; -} -.clearfloat { - clear:both; - height:0; - font-size: 1px; - line-height: 0px; -} - -/* *************************************** - DEFAULTS -*************************************** */ -body { - text-align:left; - margin:0 auto; - padding:0; - background: #4690d6; - font: 75%/1.5 "Lucida Grande", "Lucida Sans", Verdana, sans-serif; - color: #333333; -} -a { - color: #4690d6; - text-decoration: none; -} -a:visited { - color: #336699; -} -a:hover { - color: #003366; - text-decoration: underline; -} -p { - margin: 0px 0px 15px; -} -img { - border: none; -} -ul { - margin: 5px 0px 15px; - padding-left: 20px; -} -ul li { - margin: 0px; -} -ol { - margin: 5px 0px 15px; - padding-left: 20px; -} -ul li { - margin: 0px; -} -form { - margin: 0px; - padding: 0px; -} -small { - font-size: 90%; -} -h1, h2, h3, h4, h5, h6 { - font-weight: bold; - line-height: normal; -} -h1 { font-size: 1.8em; } -h2 { font-size: 1.5em; } -h3 { font-size: 1.2em; } -h4 { font-size: 1.0em; } -h5 { font-size: 0.9em; } -h6 { font-size: 0.8em; } - -/* *************************************** - PAGE LAYOUT - MAIN STRUCTURE -*************************************** */ -#page_container { - margin:0; - padding:0; -} -#page_wrapper { - width:998px; - margin:4px auto; - min-height: 300px; - background: white; - border-right: 1px solid #666666; - border-bottom: 1px solid #000000; -} - -#layout_header { - text-align:left; - position:relative; - width:100%; - height:67px; - border-bottom:1px solid #4690d6; -} -#wrapper_header { - margin:0; - padding:10px 20px 20px 20px; -} -#layout_sidebar_left { - width: 160px; - float: left; -} -#wrapper_sidebar_left { - margin:0; - padding:20px 0 0 20px; -} - -#wrapper_sidebar_left p { - margin:0; -} - -#layout_canvas { - margin:20px 20px 20px 160px; - min-height: 360px; -} - -#layout_sidebar_right { - width:250px; /* 260-10*/ - min-height: 260px; - float:right; - padding:0px 0px 20px 10px; -} -#wrapper_sidebar_right { - margin:0; -} - -#layout_maincontent { - padding:0px 10px 20px 20px; -} -#wrapper_maincontent { - margin:0; -} -/* subclass for layout_maincontent when showing rhs sidebar */ -.has_sidebar_right { - margin:0 260px 0 0 !important; -} -/* IE6 fix */ -* html #layout_maincontent { - height:360px; -} - -#wrapper_sidebar_right .collapsable_box_content { - border-left: 1px solid #cccccc; - border-right: 1px solid #cccccc; - border-bottom: 1px solid #cccccc; -} -#wrapper_sidebar_right .collapsable_box_header { - border: 1px solid #cccccc; -} - -#wrapper_maincontent .collapsable_box_content { - margin:0; - padding:0; -} - -#layout_spotlight { - padding:0; -} -#wrapper_spotlight { - margin:0; - padding:0; - height:auto; -} -#wrapper_spotlight .collapsable_box_content { - margin:0; - padding:0 0 10px 0; - background: #dfdfdf; - height:184px; - border:none; -} -#layout_spotlight .collapsable_box_content p { - padding:0; - background: url(_graphics/temp_spotlight.gif) repeat-x left top; -} -#layout_footer { - background: url(_graphics/footer_back.gif) repeat-x left top; - height:80px; -} -#layout_footer p { - padding:20px; -} -#layout_footer a { - color:white; -} - -/* *************************************** - TOPMENU (IN HEADER) -*************************************** */ -#topmenu { - position:absolute; - top:10px; - right:20px; - width: 700px; - height:47px; - text-align: right; -} -#topmenu li { - display:inline; - list-style:none; -} -#topmenu li a { - color:#3399cc; - margin:0 10px 0 10px; -} -#topmenu li a:hover { - color:#000000; -} -#topmenu .usericon { - float:right; -} -/* temp fix - force user avatar to mini size */ -#topmenu .usericon img { - width:40px; - height:40px; -} - -/* *************************************** - COLLAPSABLE BOXES -*************************************** */ -.collapsable_box { - margin: 0 0 20px 0; - background: white; - height:auto; -} -/* IE6 fix */ -* html .collapsable_box { - height:10px; -} -.collapsable_box_header { - color: #4690d6; - background: #f5f5f5; - border-top:2px solid #4690d6; - padding: 5px 10px 5px 10px; - margin:0; -} -.collapsable_box_content { - padding: 10px; - margin:0; - height:auto; - border-left:2px solid white; - border-right:2px solid white; - border-bottom:2px solid white; -} -.collapsable_box_editpanel { - display: none; - background: #dedede; - padding:5px 10px 5px 10px; - font-size: 9px; -} -.collapsable_box_header a.toggle_box_contents { - color: #4690d6; - cursor:pointer; - font-size:16px; - font-weight: bold; - text-decoration:none; - float:right; - margin: 0; - margin-top: -4px; -} -.collapsable_box_header a.toggle_box_edit_panel { - color: #4690d6; - cursor:pointer; - font-size:9px; - text-transform: uppercase; - text-decoration:none; - font-weight: normal; - float:right; - margin: 3px 10px 0 0; -} -/* used for collapsing a content box */ -.display_none { - display:none; -} -/* used on spotlight box - to cancel default box margin */ -.no_space_after { - margin: 0 0 0 0; -} - -/* *************************************** - System messages -*************************************** */ -.messages { - border:1px solid #D3322A; - background:#F7DAD8; - color:#000; - padding:3px 10px 3px 10px; - margin:20px 20px 0px 20px; -} - - -/* *************************************** - ELGG TOOLBAR -*************************************** */ -.elggtoolbar .elggtoolbar_header { - color: #4690d6; - background: #f5f5f5; - border-top:2px solid #333333; - border-bottom:1px solid #999999; - padding: 5px 10px 5px 10px; - margin:0; -} - -.elggtoolbar { - border-left:2px solid #333333; - border-right:2px solid #333333; - border-bottom:2px solid #333333; - margin: 0 0 20px 0; -} - -.elggtoolbar ul.drawers { - width: 136px; - margin: 0; - padding: 0; - -} -.elggtoolbar li.drawer ul li { - line-height: 1.2em; - margin: 0; - padding: 3px 0 3px 0; -} -.elggtoolbar ul { - list-style: none; - margin: 0; - padding: 3px 3px 3px 10px; -} -.elggtoolbar li { - background: white; -} -.elggtoolbar li a { - text-decoration: none; - color: #3399cc; - line-height:0.5em; - padding-left:5px; -} -.elggtoolbar li a:hover { - text-decoration: underline; - color: #003366; -} -.elggtoolbar h2.drawer-handle { - margin: 0; - padding: 1px 1px 1px 10px; - background-color: #f4f4f4; - border-top: 1px solid #999999; - cursor: pointer; - font-size: 100%; - font-weight: normal; - line-height: 2em; -} -.elggtoolbar h2.drawer-handle:hover { - background-color: #cccccc; -} -.elggtoolbar h2.drawer-handle.open { - color:#000000; - font-weight: bold; - background: #cccccc; - border-bottom: none; -} - -/* *************************************** - GENERAL FORM ELEMENTS -*************************************** */ -label { - font-weight: bold; - color:#666; - font-size: 100%; -} -input { - font: 110% Arial, Helvetica, sans-serif; - width: 220px; - padding: 5px 3px 3px 7px; - border: 1px solid #cccccc; -} -textarea { - font: 110% Arial, Helvetica, sans-serif; - width: 480px; - height: 140px; - border: solid 1px #cccccc; - padding: 5px 3px 3px 7px; -} -.submit_button { - font: 12px/100% Arial, Helvetica, sans-serif; - color: #000000; - border: none; - width: auto; - height: 25px; - padding: 2px 6px 2px 6px; - margin:10px 0 10px 0; - cursor: pointer; -} -.submit_button:hover { - background: #e4ecf5; -} -textarea:focus, input[type="text"]:focus { - border: solid 1px #3b9acc; - background: #e4ecf5; -} - -.input-text, -.input-tags, -.input-url, -.input-textarea { - width:95%; -} - -.input-textarea { - height: 200px; -} - -/* *************************************** - LOGIN / HOMEPAGE -*************************************** */ -#login-box { - text-align:left; - border:1px solid #ddd; - width:300px; - padding:10px; - background: #ffffff; -} - -/* *************************************** - MAIN CONTENT ELEMENTS -*************************************** */ -.elggtoolbar .elggtoolbar_header h1, -.collapsable_box_header h1 { - color: #4690d6; - font-size:1.25em; - line-height: 1.2em; -} - -.logo { - margin-left:21px; - margin-top:7px; -} -#header_search { - margin-right:50px; -} -#searchform input.search_input { - background-color:#FFFFFF; - border:1px solid #BBBBBB; - color:#999999; - font-size:13px; - font-weight:bold; - margin:0pt; - padding:2px; - width:180px; -} -#searchform input.search_submit_button { - color:#ffffff; - background: #cccccc; - border:none; - font-size:12px; - font-weight:bold; - margin:0px; - padding:0px; - width:auto; - height:20px; - cursor:pointer; -} -#searchform input.search_submit_button:hover { - color:#000000; -} - -/* *************************************** - END -*************************************** */ - - - + + +/* *************************************** + RESET BASE STYLES +*************************************** */ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + font-family: inherit; + vertical-align: baseline; +} +/* remember to define focus styles! */ +:focus { + outline: 0; +} +ol, ul { + list-style: none; +} +/* tables still need 'cellspacing="0"' in the markup */ +table { + border-collapse: separate; + border-spacing: 0; +} +caption, th, td { + text-align: left; + font-weight: normal; + vertical-align: top; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ""; +} +blockquote, q { + quotes: "" ""; +} +.clearfloat { + clear:both; + height:0; + font-size: 1px; + line-height: 0px; +} + +/* *************************************** + DEFAULTS +*************************************** */ +body { + text-align:left; + margin:0 auto; + padding:0; + background: #4690d6; + font: 75%/1.5 "Lucida Grande", "Lucida Sans", Verdana, sans-serif; + color: #333333; +} +a { + color: #4690d6; + text-decoration: none; +} +a:visited { + color: #336699; +} +a:hover { + color: #003366; + text-decoration: underline; +} +p { + margin: 0px 0px 15px; +} +img { + border: none; +} +ul { + margin: 5px 0px 15px; + padding-left: 20px; +} +ul li { + margin: 0px; +} +ol { + margin: 5px 0px 15px; + padding-left: 20px; +} +ul li { + margin: 0px; +} +form { + margin: 0px; + padding: 0px; +} +small { + font-size: 90%; +} +h1, h2, h3, h4, h5, h6 { + font-weight: bold; + line-height: normal; +} +h1 { font-size: 1.8em; } +h2 { font-size: 1.5em; } +h3 { font-size: 1.2em; } +h4 { font-size: 1.0em; } +h5 { font-size: 0.9em; } +h6 { font-size: 0.8em; } + +/* *************************************** + PAGE LAYOUT - MAIN STRUCTURE +*************************************** */ +#page_container { + margin:0; + padding:0; +} +#page_wrapper { + width:998px; + margin:4px auto; + min-height: 300px; + background: white; + border-right: 1px solid #666666; + border-bottom: 1px solid #000000; +} + +#layout_header { + text-align:left; + position:relative; + width:100%; + height:67px; + border-bottom:1px solid #4690d6; +} +#wrapper_header { + margin:0; + padding:10px 20px 20px 20px; +} +#layout_sidebar_left { + width: 160px; + float: left; +} +#wrapper_sidebar_left { + margin:0; + padding:20px 0 0 20px; +} + +#wrapper_sidebar_left p { + margin:0; +} + +#layout_canvas { + margin:20px 20px 20px 160px; + min-height: 360px; +} + +#layout_sidebar_right { + width:250px; /* 260-10*/ + min-height: 260px; + float:right; + padding:0px 0px 20px 10px; +} +#wrapper_sidebar_right { + margin:0; +} + +#layout_maincontent { + padding:0px 10px 20px 20px; +} +#wrapper_maincontent { + margin:0; +} +/* subclass for layout_maincontent when showing rhs sidebar */ +.has_sidebar_right { + margin:0 260px 0 0 !important; +} +/* IE6 fix */ +* html #layout_maincontent { + height:360px; +} + +#wrapper_sidebar_right .collapsable_box_content { + border-left: 1px solid #cccccc; + border-right: 1px solid #cccccc; + border-bottom: 1px solid #cccccc; +} +#wrapper_sidebar_right .collapsable_box_header { + border: 1px solid #cccccc; +} + +#wrapper_maincontent .collapsable_box_content { + margin:0; + padding:0; +} + +#layout_spotlight { + padding:0; +} +#wrapper_spotlight { + margin:0; + padding:0; + height:auto; +} +#wrapper_spotlight .collapsable_box_content { + margin:0; + padding:0 0 10px 0; + background: #dfdfdf; + height:184px; + border:none; +} +#layout_spotlight .collapsable_box_content p { + padding:0; + background: url(_graphics/temp_spotlight.gif) repeat-x left top; +} +#layout_footer { + background: url(_graphics/footer_back.gif) repeat-x left top; + height:80px; +} +#layout_footer p { + padding:20px; +} +#layout_footer a { + color:white; +} +/* *************************************** + CUSTOMISE PANEL (PROFILE & DASHBOARD) +*************************************** */ +#customise_editpanel { + /* display:none;*/ + margin: -20px 0 20px 20px; + padding:20px; + background: #dedede; +} +#customise_page_view { + width:490px; + padding:10px; + background:#666666; +} +#main_widgets { + padding-bottom:40px; + min-height: 200px; +} +#rightsidebar_widgets { + padding-bottom:40px; + min-height: 200px; +} +#customise_editpanel h2 { + color:white; + font-size: 1.2em; +} +#customise_editpanel #widget_picker_gallery h2 { + color:#333333; + font-size: 1.2em; +} + +#customise_editpanel table.draggable_widget { + width:200px; + background: #cccccc; + margin: 10px 0 0 0; + vertical-align:text-top; +} + +#widget_picker_gallery { + float:right; + border:1px solid black; + width:210px; + height:198px; + padding:10px; + overflow:auto; + overflow-x:hidden; +} +#widget_picker_gallery table.draggable_widget { + width:200px; + background: #cccccc; + margin: 10px 0 0 0; +} + +/* take care of long widget names */ +#customise_editpanel table.draggable_widget h3 { + word-wrap:break-word;/* safari, webkit, ie */ + width:140px; + line-height: 1.1em; + overflow: hidden;/* ff */ + padding:4px; +} +#widget_picker_gallery table.draggable_widget h3 { + word-wrap:break-word; + width:140px; + line-height: 1.1em; + overflow: hidden; + padding:4px; +} +#customise_editpanel img.drag_handle { + cursor:move; + padding-top: 4px; +} +#customise_editpanel img.remove_me { + padding-top: 4px; +} +#customise_editpanel img.more_info { + padding-top: 4px; +} +.ui-sortable-helper { + background: lime; + padding: 4px; + margin: 10px 0 0 0; +} +/* IE6 fix */ +* html .ui-sortable-helper h3 { + padding: 4px; +} +* html .ui-sortable-helper img.drag_handle, * html .ui-sortable-helper img.remove_me, * html .ui-sortable-helper img.more_info { + padding-top: 4px; +} +/* IE7 */ +*:first-child+html .ui-sortable-helper h3 { + padding: 4px; +} +*:first-child+html .ui-sortable-helper img.drag_handle, *:first-child+html .ui-sortable-helper img.remove_me, *:first-child+html .ui-sortable-helper img.more_info { + padding-top: 4px; +} + +.placeholder { + border:2px dashed #AAA; + margin: 10px 0 10px 0; +} + +/* *************************************** + TOPMENU (IN HEADER) +*************************************** */ +#topmenu { + position:absolute; + top:10px; + right:20px; + width: 700px; + height:47px; + text-align: right; +} +#topmenu li { + display:inline; + list-style:none; +} +#topmenu li a { + color:#3399cc; + margin:0 10px 0 10px; +} +#topmenu li a:hover { + color:#000000; +} +#topmenu .usericon { + float:right; +} +/* temp fix - force user avatar to mini size */ +#topmenu .usericon img { + width:40px; + height:40px; +} + +/* *************************************** + COLLAPSABLE BOXES +*************************************** */ +/* temp. customise button */ +a.toggle_customise_edit_panel { + float:right; +} + +.collapsable_box { + margin: 0 0 20px 0; + background: white; + height:auto; +} +/* IE6 fix */ +* html .collapsable_box { + height:10px; +} +.collapsable_box_header { + color: #4690d6; + background: #f5f5f5; + border-top:2px solid #4690d6; + padding: 5px 10px 5px 10px; + margin:0; +} +.collapsable_box_content { + padding: 10px; + margin:0; + height:auto; + border-left:2px solid white; + border-right:2px solid white; + border-bottom:2px solid white; +} +.collapsable_box_editpanel { + display: none; + background: #dedede; + padding:5px 10px 5px 10px; + font-size: 9px; +} +.collapsable_box_header a.toggle_box_contents { + color: #4690d6; + cursor:pointer; + font-size:16px; + font-weight: bold; + text-decoration:none; + float:right; + margin: 0; + margin-top: -4px; +} +.collapsable_box_header a.toggle_box_edit_panel { + color: #4690d6; + cursor:pointer; + font-size:9px; + text-transform: uppercase; + text-decoration:none; + font-weight: normal; + float:right; + margin: 3px 10px 0 0; +} +/* used for collapsing a content box */ +.display_none { + display:none; +} +/* used on spotlight box - to cancel default box margin */ +.no_space_after { + margin: 0 0 0 0; +} + +/* *************************************** + System messages +*************************************** */ +.messages { + border:1px solid #D3322A; + background:#F7DAD8; + color:#000; + padding:3px 10px 3px 10px; + margin:20px 20px 0px 20px; +} + + +/* *************************************** + ELGG TOOLBAR +*************************************** */ +.elggtoolbar .elggtoolbar_header { + color: #4690d6; + background: #f5f5f5; + border-top:2px solid #333333; + border-bottom:1px solid #999999; + padding: 5px 10px 5px 10px; + margin:0; +} + +.elggtoolbar { + border-left:2px solid #333333; + border-right:2px solid #333333; + border-bottom:2px solid #333333; + margin: 0 0 20px 0; +} + +.elggtoolbar ul.drawers { + width: 136px; + margin: 0; + padding: 0; + +} +.elggtoolbar li.drawer ul li { + line-height: 1.2em; + margin: 0; + padding: 3px 0 3px 0; +} +.elggtoolbar ul { + list-style: none; + margin: 0; + padding: 3px 3px 3px 10px; +} +.elggtoolbar li { + background: white; +} +.elggtoolbar li a { + text-decoration: none; + color: #3399cc; + line-height:0.5em; + padding-left:5px; +} +.elggtoolbar li a:hover { + text-decoration: underline; + color: #003366; +} +.elggtoolbar h2.drawer-handle { + margin: 0; + padding: 1px 1px 1px 10px; + background-color: #f4f4f4; + border-top: 1px solid #999999; + cursor: pointer; + font-size: 100%; + font-weight: normal; + line-height: 2em; +} +.elggtoolbar h2.drawer-handle:hover { + background-color: #cccccc; +} +.elggtoolbar h2.drawer-handle.open { + color:#000000; + font-weight: bold; + background: #cccccc; + border-bottom: none; +} + +/* *************************************** + GENERAL FORM ELEMENTS +*************************************** */ +label { + font-weight: bold; + color:#666; + font-size: 100%; +} +input { + font: 110% Arial, Helvetica, sans-serif; + width: 220px; + padding: 5px 3px 3px 7px; + border: 1px solid #cccccc; +} +textarea { + font: 110% Arial, Helvetica, sans-serif; + width: 480px; + height: 140px; + border: solid 1px #cccccc; + padding: 5px 3px 3px 7px; +} +.submit_button { + font: 12px/100% Arial, Helvetica, sans-serif; + color: #000000; + border: none; + width: auto; + height: 25px; + padding: 2px 6px 2px 6px; + margin:10px 0 10px 0; + cursor: pointer; +} +.submit_button:hover { + background: #e4ecf5; +} +textarea:focus, input[type="text"]:focus { + border: solid 1px #3b9acc; + background: #e4ecf5; +} + +.input-text, +.input-tags, +.input-url, +.input-textarea { + width:95%; +} + +.input-textarea { + height: 200px; +} + +/* *************************************** + LOGIN / HOMEPAGE +*************************************** */ +#login-box { + text-align:left; + border:1px solid #ddd; + width:300px; + padding:10px; + background: #ffffff; +} + +/* *************************************** + MAIN CONTENT ELEMENTS +*************************************** */ +.elggtoolbar .elggtoolbar_header h1, +.collapsable_box_header h1 { + color: #4690d6; + font-size:1.25em; + line-height: 1.2em; +} + +.logo { + margin-left:21px; + margin-top:7px; +} +#header_search { + margin-right:50px; +} +#searchform input.search_input { + background-color:#FFFFFF; + border:1px solid #BBBBBB; + color:#999999; + font-size:13px; + font-weight:bold; + margin:0pt; + padding:2px; + width:180px; +} +#searchform input.search_submit_button { + color:#ffffff; + background: #cccccc; + border:none; + font-size:12px; + font-weight:bold; + margin:0px; + padding:0px; + width:auto; + height:20px; + cursor:pointer; +} +#searchform input.search_submit_button:hover { + color:#000000; +} + +/* *************************************** + END +*************************************** */ + + + diff --git a/views/default/navigation/toolbox.php b/views/default/navigation/toolbox.php index e98ccd934..7da992d7d 100644 --- a/views/default/navigation/toolbox.php +++ b/views/default/navigation/toolbox.php @@ -1,80 +1,67 @@ - 0) { - -?> -
-

Your tools

-
    - - - -
  • -

    name ?>

    -children) > 0 ) { - echo "
      "; - foreach($item->children as $subitem) { -?> -
    • - name; ?> -
      • -"; - - } - -?> - - - - -
    -
- - - - - - + 0) { + +?> +
+

Your tools

+
    + + + +
  • +

    name ?>

    +children) > 0 ) { + echo "
      "; + foreach($item->children as $subitem) { +?> +
    • + name; ?> +
      • +"; + + } + +?> + + + + +
    +
+ + + + diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php index 75daa5b0d..fdcfe71df 100644 --- a/views/default/page_elements/header.php +++ b/views/default/page_elements/header.php @@ -1,56 +1,57 @@ -sitename; - } else if (empty($vars['config']->sitename)) { - $title = $vars['title']; - } else { - $title = $vars['config']->sitename . ": " . $vars['title']; - } - -?> - - - - - <?php echo $title; ?> - - - - - - - - - - -
-
- -
-
- -

sitename; ?>

-

- - -
-
+sitename; + } else if (empty($vars['config']->sitename)) { + $title = $vars['title']; + } else { + $title = $vars['config']->sitename . ": " . $vars['title']; + } + +?> + + + + + <?php echo $title; ?> + + + + + + + + + + + +
+
+ +
+
+ +

sitename; ?>

+

+ + +
+
-- cgit v1.2.3