ADAM / AIAHTML5

Commit 83559d99de02225b452e3920659d0fa07fa9ee59

Authored by Nikita Kulshreshtha
2 parents a62e274b 3ecfd1eb

mergd #853

Inline Side-by-side
Showing 3 changed files with 90 additions and 54 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @83559d9
... ... @@ -3618,7 +3618,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3618 3618 for (var i = 0; i <= $rootScope.resieTextArray.length - 1; i++) {
3619 3619 if($rootScope.resieTextArray[i].layerName == CangedTextAreaName)
3620 3620 {
3621   - if (/(\r\n)/gm.test($rootScope.resieTextArray[i].Rect_Text) || /\s/.test($rootScope.resieTextArray[i].Rect_Text)) {
  3621 + if (/(\r\n)/gm.test($rootScope.resieTextArray[i].Rect_Text) || (/\s/.test($rootScope.resieTextArray[i].Rect_Text) != true)) {
3622 3622 textAftrResize = ($rootScope.resieTextArray[i].Rect_Text).replace(/(\r\n)/gm, "");
3623 3623 for (var i = 0;i <= $rootScope.textWidth.length - 1; i++) {
3624 3624 if ($rootScope.textWidth[i].id == layer.name) {
... ... @@ -4197,7 +4197,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4197 4197 var textAftrResize;
4198 4198 for (var i = 0; i <= $rootScope.duplicateResizeTextArray.length - 1; i++) {
4199 4199 if ($rootScope.duplicateResizeTextArray[i].layerName == CangedTextAreaName) {
4200   - if (/(\r\n)/gm.test($rootScope.duplicateResizeTextArray[i].Rect_Text) || /\s/.test($rootScope.duplicateResizeTextArray[i].Rect_Text)) {
  4200 + if (/(\r\n)/gm.test($rootScope.duplicateResizeTextArray[i].Rect_Text) || (/\s/.test($rootScope.duplicateResizeTextArray[i].Rect_Text != true))) {
4201 4201 textAftrResize = ($rootScope.duplicateResizeTextArray[i].Rect_Text).replace(/(\r\n)/gm, "");
4202 4202 for (var i = 0; i <= $rootScope.duplicatetextWidth.length - 1; i++) {
4203 4203 if ($rootScope.duplicatetextWidth[i].id == layer.name) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
  View file @83559d9
1   -<div class="bodyWrap row ">
2   - <div ng-include="'app/widget/MainMenu.html'" />
3   - <div class="main" ng-init="loadDissectibleAnatomyData()">
4   - <!--<div class="main">-->
5   - <div class="col-sm-12" style="padding-left:25px; width:99%">
6   - <div id="inner-anatomyPage">
7   -
8   - <!-- Nav tabs -->
9   - <ul class="nav nav-tabs" role="tablist">
10   - <li role="presentation" id="Male" class="active" ng-click="getDAViewList($event)"><a><i class="fa fa-mars-stroke "></i> Male</a></li>
11   - <li role="presentation" id="Female" ng-click="getDAViewList($event)"><a><i class="fa fa-venus"></i> Female</a></li>
12   - </ul>
13   - <!-- Tab panes -->
14   - <div class="tab-content">
15   - <div role="tabpanel" class="tab-pane active">
16   - <div class="row" id="bodyViewList">
17   -
18   -
19   -
20   - </div>
21   - </div>
22   -
23   - </div>
24   - </div>
25   - </div>
26   - </div>
27   - </div>
28   -
29   - <script>
30   - $(function () {
31   -
32   - $(function () {
33   - $('[data-toggle="tooltip"]').tooltip();
34   - })
35   - });
36   - </script>
37   - <script>
38   - (function ($) {
39   - $(window).load(function () {
40   - $(".sidebar").mCustomScrollbar({
41   - autoHideScrollbar: true,
42   - //theme:"rounded"
43   - });
44   - //alert("side bar DA page");
45   - });
46   - })(jQuery);
47   - </script>
48   - <script>
49   - $(function () {
50   - $(".modal").draggable();
51   - });
52   - </script>
  1 +<div class="bodyWrap row ">
  2 + <div ng-include="'app/widget/MainMenu.html'" />
  3 + <div class="main" ng-init="loadDissectibleAnatomyData()">
  4 + <!--<div class="main">-->
  5 + <div class="col-sm-12" style="padding-left:25px; width:99%">
  6 + <div id="inner-anatomyPage">
  7 +
  8 + <!-- Nav tabs -->
  9 + <ul class="inner-anatomyPageUl">
  10 + <li id="Male" class="active" ng-click="getDAViewList($event)"><a><i class="fa fa-mars-stroke "></i> Male</a></li>
  11 + <li id="Female" ng-click="getDAViewList($event)"><a><i class="fa fa-venus"></i> Female</a></li>
  12 + </ul>
  13 + <!-- Tab panes -->
  14 + <div class="tab-content">
  15 + <div role="tabpanel" class="tab-pane active">
  16 + <div class="row" id="bodyViewList">
  17 +
  18 +
  19 +
  20 + </div>
  21 + </div>
  22 +
  23 + </div>
  24 + </div>
  25 + </div>
  26 + </div>
  27 + </div>
  28 +
  29 + <script>
  30 + $(function () {
  31 +
  32 + $(function () {
  33 + $('[data-toggle="tooltip"]').tooltip();
  34 + })
  35 + });
  36 + </script>
  37 + <script>
  38 + (function ($) {
  39 + $(window).load(function () {
  40 + $(".sidebar").mCustomScrollbar({
  41 + autoHideScrollbar: true,
  42 + //theme:"rounded"
  43 + });
  44 + //alert("side bar DA page");
  45 + });
  46 + })(jQuery);
  47 + </script>
  48 + <script>
  49 + $(function () {
  50 + $(".modal").draggable();
  51 + });
  52 + </script>
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @83559d9
... ... @@ -350,6 +350,42 @@ pointer-events: auto;
350 350 background: #1c92d0;
351 351 border: 1px solid #1c92d0;
352 352 }
  353 +
  354 + .inner-anatomyPageUl{
  355 + float: left;
  356 + margin: 0px 0px 10px 0px;
  357 + padding: 0;
  358 + border-bottom: 1px solid #494949;
  359 + width: 100%;
  360 +
  361 + }
  362 + .inner-anatomyPageUl li{
  363 + list-style-type:none;
  364 + display:inline-block;
  365 + float:left;
  366 +
  367 + }
  368 + .inner-anatomyPageUl li:nth-child(2){
  369 + margin-left:3px;
  370 +
  371 + }
  372 + .inner-anatomyPageUl li a {
  373 + color: #fff;
  374 + padding: 10px 15px;
  375 + text-decoration:none;
  376 + float:left;
  377 + border: 1px solid transparent;
  378 + border-radius: 2px 2px 0 0;
  379 + }
  380 + .inner-anatomyPageUl li.active a, .inner-anatomyPageUl li a:hover {
  381 + background: #1c92d0;
  382 + border: 1px solid #1c92d0;
  383 +
  384 + }
  385 +
  386 +
  387 +
  388 +
353 389 .main {
354 390 margin-left: 200px;
355 391 position: relative;
... ...