litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2403 Remove tabs from code

Browse source
This commit is contained in:
brianjlowe 2011-05-10 20:15:55 +00:00
parent 663090318d
commit 3ee550d0cd
4 changed files with 5 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
productMods/WEB-INF/init-data/initialSiteConfig.rdf
View file

@ -4,18 +4,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
xmlns:j.0="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
<rdf:Description rdf:nodeID="tab1">
<rdf:type rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#PrimaryTab"/>
<rdf:type rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#AutoLinkableTab"/>
<rdf:type rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Tab"/>
<j.0:dayLimit rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</j.0:dayLimit>
<j.0:tabBody rdf:datatype="http://www.w3.org/2001/XMLSchema#string">&lt;h3&gt;Welcome! You have successfully installed VIVO!&lt;/h3&gt;
&lt;p&gt;Your next step is to &lt;a href="siteAdmin?home=1&amp;login=block"&gt;log in&lt;/a&gt; and change your password. You can find the login link in the header on the right above.&lt;/p&gt;
&lt;p&gt;Please see the &lt;a href="http://vivoweb.org/support/" target="_blank"&gt;support section&lt;/a&gt; of the VIVO project web site for help with site administration, manual data input, and data ingest. There is information about the VIVO Ontology, as well as an FAQ and glossary. &lt;/p&gt;</j.0:tabBody>
<rdfs:label xml:lang="en-US">Home</rdfs:label>
<j.0:inPortal rdf:parseType="Resource">
<rdf:Description>
<rdf:type rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Portal"/>
<rdfs:label xml:lang="en-US">VIVO</rdfs:label>
<j.0:shortHand rdf:datatype="http://www.w3.org/2001/XMLSchema#string">enabling national networking of scientists</j.0:shortHand>
@ -38,6 +27,5 @@
&lt;p&gt;See more information on the &lt;a href="http://vivoweb.org"&gt;VIVO Project&lt;/a&gt;.&lt;/p&gt;</j.0:aboutText>
<j.0:themeDir rdf:datatype="http://www.w3.org/2001/XMLSchema#string">themes/wilma/</j.0:themeDir>
</j.0:inPortal>
</rdf:Description>
</rdf:RDF>

8
productMods/WEB-INF/web.xml
View file

@ -1083,14 +1083,6 @@
<!-- NOTICE: index.jsp is mapped to TabController so that we
can have the urls that use to be in the system still work even
though we no longer use index.jsp -->
<servlet>
<servlet-name>TabController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TabController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>TabController</servlet-name>
<url-pattern>/index.jsp</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>HomePageController</servlet-name>

4
productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
View file

@ -18,10 +18,6 @@
</#if>
</#if>
<#if currentTheme != "wilma"> <#-- wilma doesn't support tabs -->
<li><a href="${siteConfig.urls.tabs}">Tab management</a></li>
</#if>
<#-- TODO This goes away when the UserAccounts are fully implemented - jblake -->
<#if siteConfig.urls.users??>
<li><a href="${siteConfig.urls.users}">User accounts</a></li>

11
themes/vivo-basic/templates/menu.ftl
View file

@ -3,17 +3,8 @@
<#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
<div id="navAndSearch" class="block">
<div id="primaryAndOther">
<ul id="primary">
<#list tabMenu.items as item>
<li>
<a href="${item.url}" <#if item.active> class="activeTab" </#if>>
${item.linkText}
</a>
</li>
</#list>
</ul>
<ul id="primary"><li> &nbsp; <!-- tabs have been removed --> </li></ul>
</div>
<div id="searchBlock">
<form id="searchForm" action="${urls.search}" >
<label for="search">Search </label>