You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2015/05/19 18:29:44 UTC
svn commit: r1680335 - in
/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates:
htmlFormMacroLibrary.ftl htmlMenuMacroLibrary.ftl htmlScreenMacroLibrary.ftl
Author: adrianc
Date: Tue May 19 16:29:44 2015
New Revision: 1680335
URL: http://svn.apache.org/r1680335
Log:
Change btn-sm to btn-xs for buttons regarding calendar and field lookup - https://issues.apache.org/jira/browse/OFBIZ-6390.
Modified:
ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl
ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlMenuMacroLibrary.ftl
ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlScreenMacroLibrary.ftl
Modified: ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl?rev=1680335&r1=1680334&r2=1680335&view=diff
==============================================================================
--- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl Tue May 19 16:29:44 2015
@@ -189,7 +189,7 @@ under the License.
})
<#if mask?has_content>.mask("${mask}")</#if>
;
- jQuery('.ui-datepicker-trigger').removeClass('ui-datepicker-trigger').addClass('btn btn-primary btn-sm').html('<span class="glyphicon glyphicon-calendar"></span>');
+ jQuery('.ui-datepicker-trigger').removeClass('ui-datepicker-trigger').addClass('btn btn-primary btn-xs').html('<span class="glyphicon glyphicon-calendar"></span>');
</script>
</#if>
<#if timeDropdown?has_content && timeDropdown=="time-dropdown">
@@ -557,7 +557,7 @@ under the License.
</span>
<script type="text/javascript">
jQuery(document).ready(function(){
- jQuery('.ui-datepicker-trigger').removeClass('ui-datepicker-trigger').addClass('btn btn-primary btn-sm').html('<span class="glyphicon glyphicon-calendar"></span>');
+ jQuery('.ui-datepicker-trigger').removeClass('ui-datepicker-trigger').addClass('btn btn-primary btn-xs').html('<span class="glyphicon glyphicon-calendar"></span>');
});
</script>
</#macro>
Modified: ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlMenuMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlMenuMacroLibrary.ftl?rev=1680335&r1=1680334&r2=1680335&view=diff
==============================================================================
--- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlMenuMacroLibrary.ftl (original)
+++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlMenuMacroLibrary.ftl Tue May 19 16:29:44 2015
@@ -76,7 +76,7 @@ under the License.
jQuery(".navbar-pills.pull-right li a.buttontext.create").each(function(){
var linkText = jQuery(this).html();
var data = '<span class="glyphicon glyphicon-plus"></span> '+linkText;
- jQuery(this).removeClass('buttontext').removeClass('create').addClass("btn btn-primary btn-sm");
+ jQuery(this).removeClass('buttontext').removeClass('create').addClass("btn btn-primary btn-xs");
jQuery(this).html(data);
});
</script>
Modified: ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlScreenMacroLibrary.ftl?rev=1680335&r1=1680334&r2=1680335&view=diff
==============================================================================
--- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlScreenMacroLibrary.ftl Tue May 19 16:29:44 2015
@@ -156,29 +156,29 @@ under the License.
<div class="panel panel-default"<#if id?has_content> id="${id}"</#if>>
<#-- <#if showMore> -->
<#if title?has_content>
- <div class="panel-heading">
- <#if collapsible>
- <#assign btnId = "${id}-btn">
- <div class="pull-left"><h3 class="panel-title">${title}</h3></div>
- <div class="pull-right">
- <a id="${btnId}" class="btn btn-default btn-sm" data-toggle="collapse" href="#${collapsibleAreaId}" aria-expanded="true" aria-controls="${btnId}"><span class="glyphicon glyphicon-chevron-up"></span></a>
- </div>
- <div class="clear"></div>
- <script type="text/javascript">
- $('#${btnId}').click(function(){
- $(this).find('span').toggleClass('glyphicon-chevron-up glyphicon-chevron-down');
- });
- </script>
- <#else>
- <h3 class="panel-title">${title}</h3>
- </#if>
- </div>
+ <div class="panel-heading">
+ <#if collapsible>
+ <#assign btnId = "${id}-btn">
+ <div class="pull-left"><h3 class="panel-title">${title}</h3></div>
+ <div class="pull-right">
+ <a id="${btnId}" class="btn btn-default btn-xs" data-toggle="collapse" href="#${collapsibleAreaId}" aria-expanded="true" aria-controls="${btnId}"><span class="glyphicon glyphicon-chevron-up"></span></a>
+ </div>
+ <div class="clear"></div>
+ <script type="text/javascript">
+ $('#${btnId}').click(function(){
+ $(this).find('span').toggleClass('glyphicon-chevron-up glyphicon-chevron-down');
+ });
+ </script>
+ <#else>
+ <h3 class="panel-title">${title}</h3>
+ </#if>
+ </div>
</#if>
${menuString}
<#if collapsible>
- <div <#if collapsibleAreaId?has_content> id="${collapsibleAreaId}" </#if> class="panel-body collapse in">
+ <div <#if collapsibleAreaId?has_content> id="${collapsibleAreaId}" </#if> class="panel-body collapse in">
<#else>
- <div <#if collapsibleAreaId?has_content> id="${collapsibleAreaId}" </#if> class="panel-body">
+ <div <#if collapsibleAreaId?has_content> id="${collapsibleAreaId}" </#if> class="panel-body">
</#if>
</#macro>
<#macro renderScreenletSubWidget></#macro>