You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by ki...@apache.org on 2017/02/20 21:18:05 UTC
svn commit: r1783800 - in
/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp:
./ css/ less/
Author: kishore
Date: Mon Feb 20 21:18:05 2017
New Revision: 1783800
URL: http://svn.apache.org/viewvc?rev=1783800&view=rev
Log:
Wrapped tabs in .box-header
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editconnection.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editgroup.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editjob.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editnotification.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/boxes.less
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/navs.less
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css Mon Feb 20 21:18:05 2017
@@ -1162,7 +1162,7 @@ a:focus {
border-left: 1px solid #f4f4f4;
}
.box.box-solid {
- border-top: 0px;
+ border-top: 0;
}
.box.box-solid > .box-header .btn.btn-default {
background: transparent;
@@ -1302,7 +1302,7 @@ a:focus {
.box-header {
color: #444;
display: block;
- padding: 10px;
+ padding-top: 10px;
position: relative;
}
.box-header.with-border {
@@ -1729,10 +1729,7 @@ a:focus {
border-top: 0;
}
.nav-tabs > li:first-of-type {
- margin-left: 0;
-}
-.nav-tabs > li:first-of-type.active > a {
- border-left-width: 0;
+ margin-left: 10px;
}
.nav-tabs.pull-right {
float: none!important;
@@ -1772,6 +1769,7 @@ a:focus {
border: 0;
}
.tab-group {
+ border-bottom: 1px solid #f4f4f4;
padding-bottom: 0px;
}
.tab-group .btn-group {
@@ -1797,6 +1795,9 @@ a:focus {
-webkit-box-shadow: none;
box-shadow: none;
}
+.tab-group > .btn-group:first-of-type {
+ margin-left: 10px;
+}
/* PAGINATION */
.pagination > li > a {
background: #fafafa;
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp Mon Feb 20 21:18:05 2017
@@ -292,7 +292,7 @@ try
<input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/>
<input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/>
- <div class="box-body">
+ <div class="box-header">
<ul class="nav nav-tabs" role="tablist">
<%
int tabNum = 0;
@@ -319,6 +319,9 @@ try
}
%>
</ul>
+ </div>
+ <div class="box-body">
+ <div class="tab-content">
<%
// Name tab
@@ -550,6 +553,7 @@ try
if (className.length() > 0)
AuthorityConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName);
%>
+ </div>
</div>
<div class="box-footer clearfix">
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editconnection.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editconnection.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editconnection.jsp Mon Feb 20 21:18:05 2017
@@ -286,7 +286,7 @@ try
<input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/>
<input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/>
- <div class="box-body">
+ <div class="box-header">
<ul class="nav nav-tabs" role="tablist">
<%
int tabNum = 0;
@@ -315,6 +315,8 @@ try
}
%>
</ul>
+ </div>
+ <div class="box-body">
<div class="tab-content">
<%
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editgroup.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editgroup.jsp?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editgroup.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editgroup.jsp Mon Feb 20 21:18:05 2017
@@ -186,7 +186,7 @@ try
<input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/>
<input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/>
- <div class="box-body">
+ <div class="box-header">
<ul class="nav nav-tabs" role="tablist">
<%
@@ -214,6 +214,8 @@ try
}
%>
</ul>
+ </div>
+ <div class="box-body">
<div class="tab-content">
<%
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editjob.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editjob.jsp Mon Feb 20 21:18:05 2017
@@ -795,7 +795,8 @@ function isRegularExpression(value)
<%
}
%>
- <div class="box-header with-border tab-group">
+ <div class="box-header">
+ <div class="tab-group">
<%
int activeTab = 0;
int lastTabSeq = -1;
@@ -874,6 +875,7 @@ function isRegularExpression(value)
}
// Missing remainder tab ON PURPOSE -- comes from rowspan=2 tab above
%>
+ </div>
</div>
<div class="box-body">
<div class="tab-content">
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editnotification.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editnotification.jsp?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editnotification.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editnotification.jsp Mon Feb 20 21:18:05 2017
@@ -256,7 +256,7 @@ try
<input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/>
<input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/>
- <div class="box-body">
+ <div class="box-header">
<ul class="nav nav-tabs" role="tablist">
<%
@@ -284,6 +284,8 @@ try
}
%>
</ul>
+ </div>
+ <div class="box-body">
<div class="tab-content">
<%
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp Mon Feb 20 21:18:05 2017
@@ -262,7 +262,7 @@ try
<input type="hidden" name="tabname" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>"/>
<input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/>
- <div class="box-body">
+ <div class="box-header">
<ul class="nav nav-tabs" role="tablist">
<%
int tabNum = 0;
@@ -289,6 +289,8 @@ try
}
%>
</ul>
+ </div>
+ <div class="box-body">
<div class="tab-content">
<%
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp Mon Feb 20 21:18:05 2017
@@ -255,7 +255,7 @@ try
<input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/>
<input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/>
- <div class="box-body">
+ <div class="box-header">
<ul class="nav nav-tabs" role="tablist">
<%
int tabNum = 0;
@@ -282,6 +282,8 @@ try
}
%>
</ul>
+ </div>
+ <div class="box-body">
<div class="tab-content">
<%
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/boxes.less
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/boxes.less?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/boxes.less (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/boxes.less Mon Feb 20 21:18:05 2017
@@ -30,7 +30,7 @@
&.box-default {
border-top-color: @gray;
}
-
+
// collapsed mode
&.collapsed-box {
.box-body,
@@ -38,7 +38,7 @@
display: none;
}
}
-
+
.nav-stacked {
> li {
border-bottom: 1px solid @box-border-color;
@@ -69,12 +69,12 @@
//use this class to get a colored header and borders
&.box-solid {
- border-top: 0px;
+ border-top: 0;
> .box-header {
.btn.btn-default {
background: transparent;
}
- .btn,
+ .btn,
a {
&:hover {
background: rgba(0,0,0,0.1)!important;
@@ -105,7 +105,7 @@
> .box-header > .box-tools .btn {
border: 0;
box-shadow: none;
- }
+ }
// Fix font color for tiles
&[class*='bg'] {
@@ -123,7 +123,6 @@
}
}
-
// jQuery Knob in a box
.knob-label {
text-align: center;
@@ -161,7 +160,6 @@
.overlay.dark {
background: rgba(0, 0, 0, 0.5);
}
-
}
//Add clearfix to header, body and footer
@@ -172,10 +170,10 @@
}
//Box header
-.box-header {
+.box-header {
color: #444;
display: block;
- padding: @box-padding;
+ padding-top: @box-padding;
position: relative;
//Add bottom border
@@ -244,7 +242,7 @@
// Tables within the box body
> .table {
margin-bottom: 0;
- }
+ }
// Calendar within the box body
.fc {
@@ -288,4 +286,3 @@
.box-input {
max-width: 200px;
}
-
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/navs.less
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/navs.less?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/navs.less (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/navs.less Mon Feb 20 21:18:05 2017
@@ -43,12 +43,7 @@
}
> li:first-of-type {
- margin-left: 0;
- &.active {
- > a {
- border-left-width: 0;
- }
- }
+ margin-left: 10px;
}
//Pulled to the right
@@ -105,6 +100,7 @@
}
.tab-group{
+ border-bottom: 1px solid @box-border-color;
padding-bottom: 0px;
.btn-group{
@@ -131,6 +127,10 @@
}
}
}
+
+ > .btn-group:first-of-type{
+ margin-left:10px;
+ }
}
/* PAGINATION */
@@ -143,4 +143,4 @@
> li:last-of-type a {
.border-radius(0);
}
-}
\ No newline at end of file
+}
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less?rev=1783800&r1=1783799&r2=1783800&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less Mon Feb 20 21:18:05 2017
@@ -59,4 +59,4 @@
@import "skin-black.less";
//google fonts
-@import "sourcesanspro-fonts.less";
\ No newline at end of file
+@import "sourcesanspro-fonts.less";