Commit 572a617873981fdc6681aab4da6585d1c8cf312d
Merge branch 'Bug_8771_mod_symbol' into Develop
Showing
4 changed files
with
3 additions
and
2 deletions
300-PROTOTYPES/20160726/welcome.html
| @@ -555,7 +555,7 @@ | @@ -555,7 +555,7 @@ | ||
| 555 | <div class=""> | 555 | <div class=""> |
| 556 | <div class="col-sm-6"> | 556 | <div class="col-sm-6"> |
| 557 | <h5 class="font13 bolder">Modesty Setting</h5> | 557 | <h5 class="font13 bolder">Modesty Setting</h5> |
| 558 | - <!--<img src="img/adam-leaf.png" alt="">--> | 558 | + <img src="img/adam-leaf.png" alt="" class="pull-left marginR5"> |
| 559 | <div class="radio"> | 559 | <div class="radio"> |
| 560 | <label> | 560 | <label> |
| 561 | <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked> | 561 | <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked> |
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
| @@ -144,6 +144,7 @@ | @@ -144,6 +144,7 @@ | ||
| 144 | <Content Include="content\images\ca\thumbnails\ca_tni_3402.jpg" /> | 144 | <Content Include="content\images\ca\thumbnails\ca_tni_3402.jpg" /> |
| 145 | <Content Include="content\images\ca\thumbnails\ca_tni_3403.jpg" /> | 145 | <Content Include="content\images\ca\thumbnails\ca_tni_3403.jpg" /> |
| 146 | <Content Include="content\images\ca\thumbnails\ca_tni_3404.jpg" /> | 146 | <Content Include="content\images\ca\thumbnails\ca_tni_3404.jpg" /> |
| 147 | + <Content Include="content\images\common\adam-leaf.png" /> | ||
| 147 | <Content Include="content\images\common\annotation-tool-bar\blank-shape.jpg" /> | 148 | <Content Include="content\images\common\annotation-tool-bar\blank-shape.jpg" /> |
| 148 | <Content Include="content\images\common\annotation-tool-bar\pattern-2burn.jpg" /> | 149 | <Content Include="content\images\common\annotation-tool-bar\pattern-2burn.jpg" /> |
| 149 | <Content Include="content\images\common\annotation-tool-bar\pattern-3burn.jpg" /> | 150 | <Content Include="content\images\common\annotation-tool-bar\pattern-3burn.jpg" /> |
400-SOURCECODE/AIAHTML5.Web/content/images/common/adam-leaf.png
0 → 100644
4.35 KB
400-SOURCECODE/AIAHTML5.Web/index.html
| @@ -423,7 +423,7 @@ | @@ -423,7 +423,7 @@ | ||
| 423 | <div class=""> | 423 | <div class=""> |
| 424 | <div class="col-sm-6"> | 424 | <div class="col-sm-6"> |
| 425 | <h5 class="font13 bolder">Modesty Setting</h5> | 425 | <h5 class="font13 bolder">Modesty Setting</h5> |
| 426 | - <!--<img src="img/adam-leaf.png" alt="">--> | 426 | + <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5"> |
| 427 | <div class="radio"> | 427 | <div class="radio"> |
| 428 | <label> | 428 | <label> |
| 429 | <input type="radio" ng-checked="isModestyOn" ng-model="formsetting.modesty" value="Y" name="modestyRadios" id="modon" ng-click="ChangeModesty(formsetting,'Y')"> | 429 | <input type="radio" ng-checked="isModestyOn" ng-model="formsetting.modesty" value="Y" name="modestyRadios" id="modon" ng-click="ChangeModesty(formsetting,'Y')"> |