Skip to content

Commit

Permalink
Sak-30577 - Web Content Fixes (sakaiproject#2175)
Browse files Browse the repository at this point in the history 
* SAK-30577 Adjusted Web Content Edit form layout and fixed button placement

SAK-30577 Fixed placement of Web Content buttons

* Customized iframe tool
  • Loading branch information
@AndrewWJordan @juanjmerono
AndrewWJordan authored and juanjmerono committed Apr 14, 2016
1 parent 529b48d commit e0d8daa
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 62 deletions.
2 changes: 1 addition & 1 deletion reference/library/src/morpheus-master/sass/modules/tool/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,4 @@

.alertMessage{
@extend .bs-callout-danger;
}
}
5 changes: 5 additions & 0 deletions reference/library/src/morpheus-master/sass/modules/tool/iframe/_iframe.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

#{$namespace}sakai-iframe {
margin: -1em 0 0 0;
top: 0px;
}
1 change: 1 addition & 0 deletions reference/library/src/morpheus-master/sass/tool.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
@import "modules/tool/forums/forums";
@import "modules/tool/mbm/mbm";
@import "modules/tool/profile2/profile2";
@import "modules/tool/iframe/iframe";

@import "base/rtl";

Expand Down
142 changes: 81 additions & 61 deletions web/web-portlet/src/bundle/vm/edit.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,70 +20,90 @@ $(document).ready(function() {
</div>
<div class="clear"></div>
#end
<form action="$actionUrl" method="post" name="customizeForm" >
#if ($!pageTitleEditable)
<p class="shorttext indnt1">
<span class="reqStar">*</span>
<label for="title-of-tool"> $tlang.getString("gen.tootit")</label>
<input type="text" id="title-of-tool" name="title" value="$title" /><br />
</p>
<p class="shorttext indnt1">
<span class="reqStar">*</span>
<label for="title-of-page"> $tlang.getString("gen.pagtit")</label>
<input type="text" id="title-of-page" name="title-of-page" value="$page_title" /><br />
</p>
#else
<p class="shorttext indnt1">
<span class="reqStar">*</span>
<label for="title"> $tlang.getString("gen.title")</label>
<input type="text" id="title" name="title" value="$title" /><br />
</p>
#end
<p class="shorttext indnt1">
<label for="fa_icon"> $tlang.getString("gen.fa_icon")</label>
<input type="text" id="fa_icon" name="fa_icon" value="$fa_icon" /><br />
</p>
<p class="shorttext indnt1">
<label for="height">$tlang.getString("gen.height")</label>
<select id="height" name="height" size="1" onchange="this.value=='$tlang.getString('gen.heisomelse')'?document.getElementById('customNumber').style.display = 'block':document.getElementById('customNumber').style.display = 'none'">
<option value = "300px" #if ($!height == "300px") selected="selected" #end>$tlang.getString('gen.hei1')</option>
<option value = "450px" #if ($!height == "450px") selected="selected" #end>$tlang.getString('gen.hei2')</option>
<option value = "600px" #if ($!height == "600px") selected="selected" #end>$tlang.getString('gen.hei3')</option>
<option value = "750px" #if ($!height == "750px") selected="selected" #end>$tlang.getString('gen.hei4')</option>
<option value = "900px" #if ($!height == "900px") selected="selected" #end>$tlang.getString('gen.hei5')</option>
<option value = "1200px" #if ($!height == "1200px") selected="selected" #end>$tlang.getString('gen.hei6')</option>
<option value = "1800px" #if ($!height == "1800px") selected="selected" #end>$tlang.getString('gen.hei7')</option>
<option value = "2400px" #if ($!height == "2400px") selected="selected" #end>$tlang.getString('gen.hei8')</option>
<option value = "$tlang.getString('gen.heisomelse')" #if ($!height == "$tlang.getString('gen.heisomelse')") selected="selected" #end>$tlang.getString('gen.heisomelse')</option>
</select>
</p>
<div class="container pull-left">
<div class="row">
<div class="col-sm-6">
<form action="$actionUrl" method="post" name="customizeForm" >
#if ($!pageTitleEditable)
<div class="form-group">
<!--<span class="reqStar">*</span>-->
<label for="title-of-tool" class="control-label form-control-label">* $tlang.getString("gen.tootit")</label>
<input type="text" id="title-of-tool" class="form-control" name="title" value="$title" /><br />
</div>

<p class="shorttext" id="customNumber" #if ($height == "$tlang.getString('gen.heisomelse')") style="display:block" #else style="display:none" #end>
<label for="customNumberField">
$tlang.getString('gen.custheight')
</label>
<input id="customNumberField" maxlength="4" size="4" type="text" name="customNumberField" #if ($height == "$tlang.getString('gen.heisomelse')") value="$!validator.escapeHtml($custom_height, false)" #end/>
$tlang.getString('gen.pixels')
</p>
#if ($source)
<p class="shorttext indnt1">
<label for="source">$tlang.getString("gen.url")</label>
<input type="text" name="source" id="source" value="$!validator.escapeHtml($!source, false)" size="40" />
</p>
#end

#if ($showPopup)
<p class ="checkbox labelindnt">
<input type="checkbox" value="true" name="popup" id="opentrue" #if ($popup) checked="checked" #end class="indnt1" />
<label for="opentrue">$tlang.getString("gen.info.pop")</label>
</p>
#end
<div class="form-group">
<!--<span class="reqStar">*</span>-->
<label for="title-of-page" class="control-label form-control-label">* $tlang.getString("gen.pagtit")</label>
<input type="text" id="title-of-page" class="form-control" name="title-of-page" value="$page_title" /><br />
</div>

#else
<div class="form-group">
<!--<span class="reqStar">*</span>-->
<label for="title" class="control-label form-control-label">* $tlang.getString("gen.title")</label>
<input type="text" id="title" class="form-control" name="title" value="$title" /><br />
</div>

#end
<div class="form-group">
<label for="fa_icon" class="control-label form-control-label"> $tlang.getString("gen.fa_icon")</label>
<input type="text" id="fa_icon" name="fa_icon" value="$fa_icon" /><br />
</div>
<br />

<div class="form-group">
<label for="height" class="control-label form-control-label"> $tlang.getString("gen.height")</label>
<select id="height" name="height" size="1" onchange="this.value=='$tlang.getString('gen.heisomelse')'?document.getElementById('customNumber').style.display = 'block':document.getElementById('customNumber').style.display = 'none'">
<option value = "300px" #if ($!height == "300px") selected="selected" #end>$tlang.getString('gen.hei1')</option>
<option value = "450px" #if ($!height == "450px") selected="selected" #end>$tlang.getString('gen.hei2')</option>
<option value = "600px" #if ($!height == "600px") selected="selected" #end>$tlang.getString('gen.hei3')</option>
<option value = "750px" #if ($!height == "750px") selected="selected" #end>$tlang.getString('gen.hei4')</option>
<option value = "900px" #if ($!height == "900px") selected="selected" #end>$tlang.getString('gen.hei5')</option>
<option value = "1200px" #if ($!height == "1200px") selected="selected" #end>$tlang.getString('gen.hei6')</option>
<option value = "1800px" #if ($!height == "1800px") selected="selected" #end>$tlang.getString('gen.hei7')</option>
<option value = "2400px" #if ($!height == "2400px") selected="selected" #end>$tlang.getString('gen.hei8')</option>
<option value = "$tlang.getString('gen.heisomelse')" #if ($!height == "$tlang.getString('gen.heisomelse')") selected="selected" #end>$tlang.getString('gen.heisomelse')</option>
</select>
</div>
<br />

<div class="form-group">
<label for="customNumberField" class="control-label form-control-label">
$tlang.getString('gen.custheight')
</label>
<input id="customNumberField" maxlength="4" size="4" type="text" name="customNumberField" #if ($height == "$tlang.getString('gen.heisomelse')") value="$!validator.escapeHtml($custom_height, false)" #end/>
$tlang.getString('gen.pixels')
</div>
<br />

#if ($source)
<div class="form-group">
<label for="source" class="control-label form-control-label">$tlang.getString("gen.url")</label>
<input type="text" name="source" id="source" value="$!validator.escapeHtml($!source, false)" size="40" />
</div>
<br />

#end

#if ($showPopup)
<div class="form-group">
<input type="checkbox" value="true" name="popup" id="opentrue" #if ($popup) checked="checked" #end class="indnt1" />
<label for="opentrue" class="control-label form-control-label">$tlang.getString("gen.info.pop")</label>
</div>
<br />

#end

<p class="act">
<input type="submit" accesskey ="s" class="active" name="$doUpdate" value="$tlang.getString('gen.save')" />
<input type="submit" accesskey ="x" name="$doCancel" value="$tlang.getString('gen.cancel')" />
</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
<p class="act">
<input type="submit" accesskey ="s" class="active" name="$doUpdate" value="$tlang.getString('gen.save')" />
<input type="submit" accesskey ="x" name="$doCancel" value="$tlang.getString('gen.cancel')" />
</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div> <!-- End of col -->
</div> <!-- End of row -->
</div> <!-- End of container -->
<div class="clearfix"></div>
<script type="text/javascript">$(document).ready(function () { fontawesome_icon_picker('#fa_icon'); });</script>
</div>

0 comments on commit e0d8daa

Please sign in to comment.