Navigation

← Previous Changeset
Next Changeset →

Changeset 1606

Timestamp:

11/18/08 01:17:21 (2 months ago)

Author:

timneill

Message:

Branch - omAdmin: Current Working copy. Most of the layout shell ready for server code. IE7 looks workable, IE6 is a shot duck. More to come

Files:

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

branches/omnium-4-admin/codebase/administration/index.php

r1598	r1606
42	42	require_once '../includes/global.inc.php';
43	43
	44	// Check permissions
	45	$_om_auth->getBlock('Can view', 'administration/');
	46
	47	// Initialise templater and set the title
44	48	$_om_layout = new OM_Layout();
	49	$_om_layout->setTitle('Omnium Administration'); #TESTING - LANG REQD
45	50
46	51	// Pass our globals to the template and begin the rendering process

branches/omnium-4-admin/codebase/includes/classes/OM_Admin.class.php

r1603	r1606
53	53	* Current loaded areas
54	54	*
55		* @var ~~array~~
	55	* @var mixed
56	56	**/
57	57	public $areas;
	58
58	59
59	60	/**
…	…
63	64	**/
64	65	private $currentArea;
	66
	67
	68	/**
	69	* Currently loaded options. Based on $currentArea
	70	*
	71	* @var mixed
	72	**/
	73	private $areaOptions;
65	74
66	75
…	…
105	114	}
106	115	}
	116
	117	/**
	118	* Loads options for the currently active admin area
	119	*
	120	* @return mixed
	121	* @author Tim Neill
	122	**/
	123	public function loadOptions()
	124	{
	125	global $_om;
	126
	127	if (file_exists($_om->path['base'] . 'administration/' . $this->getCurrentArea() . '/options.inc.php')) {
	128	@require_once ($_om->path['base'] . 'administration/' . $this->getCurrentArea() . '/options.inc.php');
	129
	130	if (isset($options)) { #TESTING
	131	$this->parseOptions((array)$options);
	132	}
	133	}
	134	}
	135
	136	/**
	137	* Processes and creates the options array
	138	*
	139	* @return void
	140	* @author Tim Neill
	141	**/
	142	private function parseOptions($optionArray)
	143	{
	144
	145	}
107	146
108	147	/**

branches/omnium-4-admin/codebase/layout/xhtml/default/administration/colour.css

r1598	r1606
47	47	a:active,
48	48	a:hover {
49		color: rgb(217, 217, 217);
	49	/color: rgb(217, 217, 217);/
	50	color: rgb(77, 77, 77);
	51	}
	52
	53	/************************************************/
	54
	55	a.action:link,
	56	a.action:visited {
	57	color: rgb(0, 128, 0) !important;
	58	}
	59
	60	a.action:active,
	61	a.action:hover {
	62	color: rgb(74, 180, 74) !important;
	63	}
	64
	65	a.delete:link,
	66	a.delete:visited {
	67	color: rgb(255, 0, 0) !important;
	68	}
	69
	70	a.delete:active,
	71	a.delete:hover {
	72	color: rgb(251, 70, 70) !important;
	73	}
	74
	75	/************************************************/
	76
	77	div#omBlockBanner div.header {
	78	border: 1px solid rgb(174, 174, 174);
50	79	}
51	80
…	…
53	82
54	83	div#omAdminNavigation ul.omAdminMajorTabs li a {
55		background-color: rgb(156, 156, 156);
56		border: 1px solid rgb(205, 205, 205);
57		border-bottom: 2px solid rgb(148, 148, 148); /* Creates a 'shadow' effect on inactive tabs */
	84	background-color: rgb(217, 217, 217);
	85	background-image: url('../shared/images/admin/tabs.gif');
	86	background-repeat: repeat-x;
	87	background-position: 0 0;
	88	-webkit-border-top-right-radius: 4px;
	89	-webkit-border-top-left-radius: 4px;
	90	-moz-border-radius-topright: 4px;
	91	-moz-border-radius-topleft: 4px;
58	92	}
59	93
60	94	div#omAdminNavigation ul.omAdminMajorTabs li.on a {
	95	background-position: 0 -25px;
61	96	background-color: rgb(217, 217, 217);
62		border-bottom-color: rgb(217, 217, 217);
	97	}
	98
	99	div#omAdminNavigation ul.omAdminMajorTabs li a:active,
	100	div#omAdminNavigation ul.omAdminMajorTabs li a:hover {
	101	background-position: 0 -50px;
	102	color: rgb(77, 77, 77);
63	103	}
64	104
65	105	div#omAdminNavigation ul.omAdminMajorTabs li.on a:active,
66	106	div#omAdminNavigation ul.omAdminMajorTabs li.on a:hover {
	107	background-position: 0 -25px;
67	108	color: rgb(77, 77, 77);
68	109	}
…	…
71	112
72	113	div#omAdminContentBlock {
	114	background-color: rgb(217, 217, 217);
	115	border-top: 0;
	116	border-left: 1px solid rgb(235, 235, 235);
	117	border-right: 1px solid rgb(198, 198, 198);
	118	border-bottom: 1px solid rgb(198, 198, 198);
	119	background-image: url('../shared/images/admin/sheen.gif');
	120	background-repeat: no-repeat;
	121	background-position: bottom right;
	122	-webkit-border-bottom-left-radius: 4px;
	123	-webkit-border-bottom-right-radius: 4px;
	124	-moz-border-radius-bottomleft: 4px;
	125	-moz-border-radius-bottomright: 4px;
	126	}
	127
	128	/************************************************/
	129
	130	div#omAdminContainer {
	131	background-color: rgb(96, 96, 96);
	132	border-top: 1px solid rgb(186, 186, 186);
	133	border-right: 1px solid rgb(235, 235, 235);
	134	border-bottom: 1px solid rgb(235, 235, 235);
	135	border-left: 1px solid rgb(186, 186, 186);
	136	background-image: url('../shared/images/admin/shadow.gif');
	137	background-repeat: no-repeat;
	138	background-position: top left;
	139	}
	140
	141	/************************************************/
	142
	143	div#omAdminContainer div.omAdminOption {
73	144	background-color: rgb(217, 217, 217);
74		border: 1px solid rgb(205, 205, 205);
75		border-top: 0;
76		}
77
78		/************************************************/
79
80		div#omAdminContainer {
81		background-color: rgb(128, 128, 128);
82		border-top: 1px solid rgb(183, 183, 183);
83		}
	145	background-image: url('../shared/images/admin/options.gif');
	146	background-repeat: repeat-x;
	147	background-position: 0 0;
	148	-webkit-border-radius: 4px;
	149	-moz-border-radius: 4px;
	150	}
	151
	152	div#omAdminContainer div.omAdminOption.on {
	153	background-position: 0 -27px;
	154	}
	155
	156	div#omAdminContainer div.omAdminOption div.header span.inactive {
	157	color: rgb(255, 0, 0);
	158	}
	159
	160	div#omAdminContainer div.omAdminOption div.content div.tabList a {
	161	border-bottom: 1px solid rgb(171, 171, 171);
	162	}
	163
	164	div#omAdminContainer div.omAdminOption div.content div.tabList a:link,
	165	div#omAdminContainer div.omAdminOption div.content div.tabList a:visited {
	166	background-color: rgb(240, 242, 244);
	167	color: rgb(119, 119, 119);
	168	background-image: url('../shared/images/admin/subtab.gif');
	169	background-repeat: repeat-y;
	170	background-position: 0 0;
	171	}
	172
	173	div#omAdminContainer div.omAdminOption div.content div.tabList a:active,
	174	div#omAdminContainer div.omAdminOption div.content div.tabList a:hover {
	175	color: rgb(77, 77, 77);
	176	background-position: -108px 0;
	177	}
	178
	179	div#omAdminContainer div.omAdminOption div.content div.tabList a.on {
	180	color: rgb(77, 77, 77);
	181	background-color: rgb(245, 245, 245);
	182	background-image: none;
	183	}
	184
	185	div#omAdminContainer div.omAdminOption div.content div.tabList a.first {
	186	-webkit-border-top-left-radius: 4px;
	187	-moz-border-radius-topleft: 4px;
	188	}
	189
	190	div#omAdminContainer div.omAdminOption div.content div.tabList a.last {
	191	-webkit-border-bottom-left-radius: 4px;
	192	-moz-border-radius-bottomleft: 4px;
	193	}
	194
	195	div#omAdminContainer div.omAdminOption div.content div.tab {
	196	background-color: rgb(245, 245, 245);
	197	-webkit-border-radius: 4px;
	198	-webkit-border-top-left-radius: 0;
	199	-moz-border-radius: 4px;
	200	-moz-border-radius-topleft: 0;
	201	}

branches/omnium-4-admin/codebase/layout/xhtml/default/administration/header.php

r1598	r1606
154	154	<div id="omBlockBanner">
155	155	<div class="header">
156		<div class="background" style="background-image:url('<?php echo($this->getWorkingPath('shared/images/~~omnium~~/horizon.gif', true)) ?>');">
157		<img class="title" src="<?php echo($this->getWorkingPath('shared/images/~~omnium~~/title.gif', true)); ?>" alt="" />
158		<img class="feature" src="<?php echo($this->getWorkingPath('shared/images/~~omnium~~/feature.gif', true)); ?>" alt="" />
	156	<div class="background" style="background-image:url('<?php echo($this->getWorkingPath('shared/images/admin/horizon.gif', true)) ?>');">
	157	<img class="title" src="<?php echo($this->getWorkingPath('shared/images/admin/title.gif', true)); ?>" alt="" />
	158	<img class="feature" src="<?php echo($this->getWorkingPath('shared/images/admin/feature.gif', true)); ?>" alt="" />
159	159	</div>
160	160	</div>

branches/omnium-4-admin/codebase/layout/xhtml/default/administration/index.php

r1598	r1606
51	51
52	52	<div id="omAdminContainer">
53		~~<!-- Tab options begin here -->~~
54	53	<?php
55		$this->requireOnce('administration/~~' . $_om_admin->getCurrentArea() . '/index~~.php');
	54	$this->requireOnce('administration/options.php');
56	55	?>
57	56

branches/omnium-4-admin/codebase/layout/xhtml/default/administration/screen.css

r1598	r1606
69	69	}
70	70
	71	span.handle {
	72	cursor: move;
	73	}
	74
71	75	/************************************************/
72	76
…	…
81	85
82	86	div#omBlockBanner div.header {
83		~~border: 1px solid rgb(174, 174, 174);~~
84	87	padding: 2px;
85	88	}
…	…
126	129	div#omAdminNavigation ul.omAdminMajorTabs li a {
127	130	display: block;
128		padding: ~~2px 6~~px;
129		margin: 0 6px;
130		height: 20px;
131		line-height: 22px;
	131	padding: 3px 9px;
	132	margin: 0 4px;
	133	height: 22px;
	134	line-height: 21px;
132	135	}
133	136
…	…
139	142	div#omAdminNavigation ul.omAdminMajorTabs li a img {
140	143	margin-top: -2px;
141		margin-right: 2px;
	144	margin-right: 3px;
142	145	}
143	146
…	…
148	151	left: 12px;
149	152	right: 12px;
150		top: 155px;
	153	top: 153px;
151	154	bottom: 12px;
152	155	}
153	156
	157	* html div#omAdminContentBlock {
	158	top: 154px;
	159	}
	160
	161	div#omAdminContentBlock {
	162	*top: 154px;
	163	}
	164
154	165	/************************************************/
155	166
…	…
157	168	position: absolute;
158	169	top: 36px;
159		right: 0;
160		left: 0;
161		bottom: 0;
	170	right: 8px;
	171	left: 8px;
	172	bottom: 8px;
162	173	overflow-y: auto;
163	174	overflow-x: hidden;
164		}
165
166		/************************************************/
	175	padding: 4px 8px;
	176	}
	177
	178	/************************************************/
	179
	180	div#omAdminContainer div.omAdminOption {
	181	min-height: 27px;
	182	padding: 0 8px;
	183	line-height: 26px;
	184	margin: 4px 0;
	185	border-radius: 4px;
	186	-moz-border-radius: 4px;
	187	}
	188
	189	div#omAdminContainer div.omAdminOption div.header {
	190	position: relative;
	191	}
	192
	193	div#omAdminContainer div.omAdminOption div.header span.inactive {
	194	font-style: italic;
	195	}
	196
	197	div#omAdminContainer div.omAdminOption div.header span.actions {
	198	position: absolute;
	199	right: 0;
	200	top: 0;
	201	}
	202
	203	div#omAdminContainer div.omAdminOption div.header span.actions input.chk {
	204	left: -18px;
	205	position: absolute;
	206	top: 6px;
	207	}
	208
	209	* html div#omAdminContainer div.omAdminOption div.header span.actions input.chk {
	210	left: -22px;
	211	top: 0;
	212	}
	213
	214	div#omAdminContainer div.omAdminOption div.header span.actions input.chk {
	215	*left: -22px;
	216	*top: 0;
	217	}
	218
	219	div#omAdminContainer div.omAdminOption div.content {
	220	padding-bottom: 12px;
	221	}
	222
	223	div#omAdminContainer div.omAdminOption div.content div.tabList {
	224	width: 108px;
	225	float: left;
	226	margin-left: -108px;
	227	}
	228
	229	div#omAdminContainer div.omAdminOption div.content div.tabList a {
	230	display: block;
	231	height: 24px;
	232	width: 78px;
	233	padding: 3px 15px;
	234	line-height: 23px;
	235	font-size: 12px;
	236	}
	237
	238	div#omAdminContainer div.omAdminOption div.content div.tabList a img {
	239	margin-right: 3px;
	240	}
	241
	242	div#omAdminContainer div.omAdminOption div.content div.tab {
	243	margin-left: 108px;
	244	}
	245
	246	div#omAdminContainer div.omAdminOption div.content div.tab div.input {
	247	margin: 4px 24px;
	248	}

Download in other formats: