Skip to Content.
Sympa Menu

comanage-dev - [comanage-dev] r285 - in registry/trunk/app: View/Elements webroot/css

Subject: COmanage Developers List

List archive

[comanage-dev] r285 - in registry/trunk/app: View/Elements webroot/css


Chronological Thread 
  • From:
  • To:
  • Subject: [comanage-dev] r285 - in registry/trunk/app: View/Elements webroot/css
  • Date: Mon, 16 Apr 2012 19:40:21 -0400

Author: marie
Date: 2012-04-16 19:40:21 -0400 (Mon, 16 Apr 2012)
New Revision: 285

Modified:
registry/trunk/app/View/Elements/dropMenu.ctp
registry/trunk/app/View/Elements/links.ctp
registry/trunk/app/webroot/css/menubar.css
Log:
co300 ui cleanup

Modified: registry/trunk/app/View/Elements/dropMenu.ctp
===================================================================
--- registry/trunk/app/View/Elements/dropMenu.ctp 2012-04-16 21:47:43
UTC (rev 284)
+++ registry/trunk/app/View/Elements/dropMenu.ctp 2012-04-16 23:40:21
UTC (rev 285)
@@ -25,9 +25,6 @@
?>

<div class="menubar">
- <div class="label">
- <?php print _txt('me.label'); ?>
- </div>
<ul class="sf-menu">

<!-- Organizations Dropdown -->
@@ -189,51 +186,6 @@
<a href="#">'._txt('me.identity').'</a>
<span class="sf-sub-indicator"> ยป</span>
<ul>';
-
- if(isset($permissions['menu']['orgprofile']) &&
$permissions['menu']['orgprofile']) {
- // A user can have more than one org identity (keyed to their
COs) if pooling is
- // disabled, so loop through as appropriate.
-
- $orgIdentities =
$this->Session->read('Auth.User.org_identities');
-
- foreach ($orgIdentities as $o) {
- // Not always available throughout the site so take backup
set by menuContent in app_controller
- if(!isset($org_identities[0]['OrgIdentity']['o']))
- $homeName = $menuContent['orgName'];
- else
- $homeName = $org_identities[0]['OrgIdentity']['o'];
-
- if(isset($o['co_id'])) {
- // Figure out the name of the CO
- $coName = "?";
-
- foreach ($mycos as $co) {
- if($co['co_id'] == $o['co_id']) {
- $coName = $co['co_name'];
- break;
- }
- }
- print "<li>";
- $args = array(
- 'controller' => 'org_identities',
- 'action' => 'view',
- $o['org_id'],
- 'co' => $o['co_id']
- );
- print $this->Html->link(_txt('me.for') . $homeName,
$args);
- print "</li>";
- } else {
- print "<li>";
- $args = array(
- 'controller' => 'org_identities',
- 'action' => 'view',
- $o['org_id']
- );
- print $this->Html->link(_txt('me.for') . $homeName,
$args);
- print "</li>";
- }
- }
- }
foreach ($mycos as $co) {
print "<li>";
$args = array(

Modified: registry/trunk/app/View/Elements/links.ctp
===================================================================
--- registry/trunk/app/View/Elements/links.ctp 2012-04-16 21:47:43 UTC (rev
284)
+++ registry/trunk/app/View/Elements/links.ctp 2012-04-16 23:40:21 UTC (rev
285)
@@ -25,7 +25,7 @@
<ul>
<li><a href="#">News</a></li>
<li><a href="#">Support</a></li>
- <li><a href="#">Directory</a></li>
+ <li><a href="/directory">Directory</a></li>
<li><a href="#">Help</a></li>
</ul>
</div>

Modified: registry/trunk/app/webroot/css/menubar.css
===================================================================
--- registry/trunk/app/webroot/css/menubar.css 2012-04-16 21:47:43 UTC (rev
284)
+++ registry/trunk/app/webroot/css/menubar.css 2012-04-16 23:40:21 UTC (rev
285)
@@ -131,16 +131,6 @@
margin-top: -15px;
min-width: 200px;
display: block;
- background: rgb(210,127,81); /* Old browsers */
- /* IE9 SVG, needs conditional override of 'filter' to 'none' */
- background:
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2QyN2Y1MSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNiODVmMzAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
- background: -moz-linear-gradient(top, rgba(210,127,81,1) 0%,
rgba(184,95,48,1) 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,rgba(210,127,81,1)), color-stop(100%,rgba(184,95,48,1))); /*
Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, rgba(210,127,81,1)
0%,rgba(184,95,48,1) 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, rgba(210,127,81,1)
0%,rgba(184,95,48,1) 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, rgba(210,127,81,1)
0%,rgba(184,95,48,1) 100%); /* IE10+ */
- background: linear-gradient(top, rgba(210,127,81,1) 0%,rgba(184,95,48,1)
100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#d27f51', endColorstr='#b85f30',GradientType=0 ); /* IE6-8 */
}

#notification ul li ul li:hover {
@@ -156,6 +146,7 @@
#notification .names {
margin: 2px 5px 5px 15px;
line-height: 16px;
+ color: #333;
}

#notification .seemore {
@@ -166,7 +157,7 @@

#notification .titleColor,
#notification ul li ul a {
- color:#5c280c !important;
+ color: #2B59BD !important;
background-color:auto !important;
}

@@ -260,7 +251,7 @@
background: none;
} /* overrides default background so background in ul can show
through */

- .menubar .dropMenu ul {
+ .sf-menu ul {
background: rgb(244,244,244); /* Old browsers */
/* IE9 SVG, needs conditional override of 'filter' to 'none' */
background:
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y0ZjRmNCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjNGM0YzQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);



  • [comanage-dev] r285 - in registry/trunk/app: View/Elements webroot/css, svnlog, 04/16/2012

Archive powered by MHonArc 2.6.16.

Top of Page