Skip to content

Commit 5015ee3

Browse files
author
Sudhir Nimavat
committed
Closes #17 add active-menu-item class
1 parent 3280986 commit 5015ee3

File tree

4 files changed

+34
-28
lines changed

4 files changed

+34
-28
lines changed

‎.classpath

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,47 @@
1111
<classpathentry kind="src" path="test/integration"/>
1212
<classpathentry kind="src" path="test/unit"/>
1313
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
14-
<classpathentry kind="src" path=".link_to_grails_plugins/fields-1.3/grails-app/services">
14+
<classpathentry kind="src" path=".link_to_grails_plugins/fields-1.2/grails-app/services">
1515
<attributes>
1616
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
1717
</attributes>
1818
</classpathentry>
19-
<classpathentry kind="src" path=".link_to_grails_plugins/fields-1.3/grails-app/taglib">
19+
<classpathentry kind="src" path=".link_to_grails_plugins/fields-1.2/grails-app/taglib">
2020
<attributes>
2121
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
2222
</attributes>
2323
</classpathentry>
24-
<classpathentry kind="src" path=".link_to_grails_plugins/fields-1.3/grails-app/views">
24+
<classpathentry kind="src" path=".link_to_grails_plugins/fields-1.2/grails-app/views">
2525
<attributes>
2626
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
2727
</attributes>
2828
</classpathentry>
29-
<classpathentry kind="src" path=".link_to_grails_plugins/fields-1.3/src/groovy">
29+
<classpathentry kind="src" path=".link_to_grails_plugins/fields-1.2/src/groovy">
3030
<attributes>
3131
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
3232
</attributes>
3333
</classpathentry>
34-
<classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/jquery-1.10.2/grails-app/conf">
34+
<classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/jquery-1.9.0/grails-app/conf">
3535
<attributes>
3636
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
3737
</attributes>
3838
</classpathentry>
39-
<classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.10.2/grails-app/services">
39+
<classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.9.0/grails-app/i18n">
4040
<attributes>
4141
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
4242
</attributes>
4343
</classpathentry>
44-
<classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.10.2/grails-app/taglib">
44+
<classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.9.0/grails-app/services">
4545
<attributes>
4646
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
4747
</attributes>
4848
</classpathentry>
49-
<classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.10.2/src/groovy">
49+
<classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.9.0/grails-app/taglib">
50+
<attributes>
51+
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
52+
</attributes>
53+
</classpathentry>
54+
<classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.9.0/src/groovy">
5055
<attributes>
5156
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
5257
</attributes>
@@ -151,17 +156,17 @@
151156
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
152157
</attributes>
153158
</classpathentry>
154-
<classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/twitter-bootstrap-2.3.2/grails-app/conf">
159+
<classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/twitter-bootstrap-2.3.0/grails-app/conf">
155160
<attributes>
156161
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
157162
</attributes>
158163
</classpathentry>
159-
<classpathentry kind="src" path=".link_to_grails_plugins/twitter-bootstrap-2.3.2/grails-app/i18n">
164+
<classpathentry kind="src" path=".link_to_grails_plugins/twitter-bootstrap-2.3.0/grails-app/i18n">
160165
<attributes>
161166
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
162167
</attributes>
163168
</classpathentry>
164-
<classpathentry kind="src" path=".link_to_grails_plugins/twitter-bootstrap-2.3.2/grails-app/taglib">
169+
<classpathentry kind="src" path=".link_to_grails_plugins/twitter-bootstrap-2.3.0/grails-app/taglib">
165170
<attributes>
166171
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
167172
</attributes>

‎grails-app/views/layouts/admin.gsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link rel="apple-touch-icon" sizes="114x114" href="${resource(dir: 'images', file: 'apple-touch-icon-retina.png')}">
1515
<g:layoutHead/>
1616
<r:require modules="nimble-admin"/>
17-
<r:layoutResources />
17+
<r:layoutResources />
1818
</head>
1919
<body>
2020
<g:set var="currentUser" value="${UserBase.get(SecurityUtils.subject.principal)}" />

‎grails-app/views/templates/nimble/navigation/_sidenavigation.gsp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
<ul class="nav nav-list" id="dashboard-menu">
2-
<!--
3-
<li class="nav-header">
4-
<i class="icon-home"></i>
5-
<span><g:message code="nimble.template.sidenavigation.heading" /></span>
6-
</li>
7-
-->
8-
<li>
2+
<li class="${controllerName == 'admins' ? 'active-menu-item' : ''}">
93
<g:link controller="admins" action="index">
104
<i class="icon-home"></i>
115
<span><g:message code="nimble.link.admins" /></span>
126
</g:link>
7+
<i class="icon-chevron-right"></i>
138
</li>
14-
<li>
9+
<li class="${controllerName == 'user' ? 'active-menu-item' : ''}">
1510
<g:link controller="user" action="list">
1611
<i class="icon-home"></i>
1712
<span><g:message code="nimble.link.users" /></span>
1813
</g:link>
19-
14+
<i class="icon-chevron-right"></i>
2015
</li>
21-
<li>
16+
<li class="${controllerName == 'role' ? 'active-menu-item' : ''}">
2217
<g:link controller="role" action="list">
2318
<i class="icon-home"></i>
2419
<span><g:message code="nimble.link.roles" /></span>
2520
</g:link>
21+
<i class="icon-chevron-right"></i>
2622
</li>
27-
<li>
23+
<li class="${controllerName == 'group' ? 'active-menu-item' : ''}">
2824
<g:link controller="group" action="list">
2925
<i class="icon-home"></i>
3026
<span><g:message code="nimble.link.groups" /></span>
3127
</g:link>
28+
<i class="icon-chevron-right"></i>
3229
</li>
3330
</ul>

‎web-app/css/nimble-core.css

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ body {
66

77

88
.navbar .navbar-inner {
9+
filter: none;
910
background: none repeat scroll 0 0 #6F8FAF;
1011
border-radius: 0 0 0 0;
1112
border: 0;
@@ -84,17 +85,20 @@ body {
8485
color: #6e6e6e;
8586
text-shadow: 1px 1px 0px #fff;
8687
font-weight: 600;
88+
display:inline-block;
89+
padding: 11px 0 11px 26px;;
90+
width: 190px;
8791
}
8892

89-
#sidebar .nav-list li.active {
90-
93+
#sidebar .nav-list li > i {
94+
display: none;
9195
}
9296

93-
#sidebar .nav-list li.active a {
94-
border: 0px;
97+
#sidebar .nav-list li.active-menu-item > i {
98+
display: inline-block;
9599
}
96100

97-
#sidebar .nav-list li:hover {
101+
#sidebar .nav-list li:hover, #sidebar .nav-list li.active-menu-item {
98102
background: #e8e8e8;
99103
border-bottom: 1px solid #cccccc;
100104
border-top: 1px solid #cccccc;

0 commit comments

Comments
 (0)