Home Explore Help
Sign In
lqq
/
LxtalkUIView
Watch 2
Star 1
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

更新

dgf 9 years ago
parent
db18ff5b2e
commit
cb761ad849
16 changed files with 321 additions and 39 deletions
Split View Show Diff Stats
  1. 217 0
      dist/userview/app-1a6ba9515a.js
  2. 1 0
      dist/userview/app-40912d635a.css
  3. 0 1
      dist/userview/app-89ce62284b.js
  4. 0 1
      dist/userview/app-9c39fee18b.css
  5. 2 2
      dist/userview/index.html
  6. 9 9
      userview/Gulpfile.js
  7. 1 4
      userview/src/js/controller/userController.js
  8. 29 0
      userview/src/js/directive/hover.js
  9. 1 1
      userview/src/js/directive/qrcode.js
  10. 3 3
      userview/src/js/templates.js
  11. 46 10
      userview/src/less/app.details.new.less
  12. 3 3
      userview/src/templates/details-new-info.html
  13. 6 2
      userview/src/templates/details-new.html
  14. 1 1
      userview/src/templates/details.html
  15. 1 1
      userview/temp/manifest/app-css-manifest.json
  16. 1 1
      userview/temp/manifest/app-js-manifest.json

File diff suppressed because it is too large
+ 217 - 0
dist/userview/app-1a6ba9515a.js


File diff suppressed because it is too large
+ 1 - 0
dist/userview/app-40912d635a.css


File diff suppressed because it is too large
+ 0 - 1
dist/userview/app-89ce62284b.js


File diff suppressed because it is too large
+ 0 - 1
dist/userview/app-9c39fee18b.css


+ 2 - 2
dist/userview/index.html
View File 

@@ -7,7 +7,7 @@
 
     <!-- 新 Bootstrap 核心 CSS 文件 -->

     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">

     <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">

-    <link rel="stylesheet" href="app-9c39fee18b.css">

+    <link rel="stylesheet" href="app-40912d635a.css">

 </head>

 

 <body ng-app="app" ng-controller="UserController" class="full-client" onselectstart="return false">

@@ -18,7 +18,7 @@
 
     <script src="../bower_components/angular/angular.min.js"></script>

     <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>

     <script src="../bower_components/angular-animate/angular-animate.min.js"></script>

-    <script src="app-89ce62284b.js"></script>

+    <script src="app-1a6ba9515a.js"></script>

 </body>

 

 </html>

+ 9 - 9
userview/Gulpfile.js
View File 

@@ -18,10 +18,10 @@ var paths = {
 
     frontend: {

         scripts: [

             '../common/*.js',

-            'src/js/**/*.js'   

+            'src/js/**/*.js'

         ],

-        styles: [            

-			'temp/css/*'    

+        styles: [

+            'temp/css/*'

         ],

         less: [

             // '../common/*.less',

@@ -39,7 +39,7 @@ var paths = {
 
 var distpath = '../dist/userview';

 

 gulp.task('app-css', function() {

-    del([distpath + '/app-*.css'],{cwd:process.cwd(),force:true});

+    del([distpath + '/app-*.css'], { cwd: process.cwd(), force: true });

     return gulp.src(paths.frontend.less)

         .pipe(less())

         .pipe(concat('app.css'))

@@ -50,7 +50,7 @@ gulp.task('app-css', function() {
 
         .pipe(gulp.dest('temp/manifest'));

 });

 

-gulp.task('rev', ['app-css','js'], function() {    

+gulp.task('rev', ['app-css', 'js'], function() {

     return gulp.src(['temp/manifest/*.json', 'src/html/index.html'])

         .pipe(revCollector())

         .pipe(gulp.dest(distpath));

@@ -58,14 +58,14 @@ gulp.task('rev', ['app-css','js'], function() {
 
 

 gulp.task('template', function() {

     return gulp.src(paths.frontend.template)

-        .pipe(templateCache('templates.js', { module:'templatescache', standalone:true, root: 'templates/' }))

+        .pipe(templateCache('templates.js', { module: 'templatescache', standalone: true, root: 'templates/' }))

         .pipe(gulp.dest('src/js'));

 });

 

 gulp.task('js', ['template'], function() {

     // Cleanup old assets

-    del([distpath + '/app-*.js'], {cwd:process.cwd(),force:true});

-    

+    del([distpath + '/app-*.js'], { cwd: process.cwd(), force: true });

+

     return gulp.src(paths.frontend.scripts)

         .pipe(concat('app.js'))

         .pipe(minifyjs())

@@ -87,7 +87,7 @@ gulp.task('js', ['template'], function() {
 
 

 gulp.task('build', ['app-css', 'template', 'js', 'rev']);

 

-gulp.task('watch', function(){

+gulp.task('watch', function() {

     gulp.watch('src/less/*.less', ['app-css', 'rev']);

     gulp.watch('src/html/**/*.html', ['rev']);

     gulp.watch('src/templates/**/*.html', ['template', 'js', 'rev']);

+ 1 - 4
userview/src/js/controller/userController.js
View File 

@@ -8,7 +8,7 @@ angular.module('app').controller('UserController', ['$scope', '$state', function
 
     //     name: '陆趣趣',

     //     l: '0578+0-lslqq',

     //     shotL: 'lslqq',

-    //     comp: '浙江万赛软件科技有限公司浙江万赛软件科技有限公司',

+    //     comp: '浙江万赛软件科技有限公司',

     //     branch: '运维部',

     //     sex: '0',

     //     mob: '15215756180',

@@ -60,8 +60,5 @@ angular.module('app').controller('UserController', ['$scope', '$state', function
 
         //   else if ($scope.user.l.length < 15 && $state.current.name !== 'details')

         //     $state.go('details');

         // }

-

     }

-

-

 }]);

+ 29 - 0
userview/src/js/directive/hover.js
View File 

@@ -0,0 +1,29 @@
 
+(function() {
 
+    'use strict';
 
+
 
+    angular
 
+        .module('app')
 
+        .directive('hovering', Directive);
 
+
 
+    function Directive() {
 
+        // Usage:
 
+        //
 
+        // Creates:
 
+        //
 
+        var directive = {
 
+            link: link,
 
+            restrict: 'A',
 
+            scope: {}
 
+        };
 
+        return directive;
 
+
 
+        function link(scope, element, attrs) {
 
+            element.bind('mouseover', function() {
 
+                element.toggleClass('active');
 
+            });
 
+            element.bind('mouseout', function() {
 
+                element.toggleClass('active');
 
+            });
 
+        }
 
+    }
 
+})();

+ 1 - 1
userview/src/js/directive/qrcode.js
View File 

@@ -31,7 +31,7 @@
 
                 "TITLE:" + $scope.user.duty + "\r\n" +

                 "EMAIL:" + $scope.user.email + "\r\n" +

                 "END:VCARD\r\n";

-            jQuery('#code').qrcode({

+            element.qrcode({

                 render: "canvas",

                 text: Utilities.toUtf8(codeText),

                 width: 200,

File diff suppressed because it is too large
+ 3 - 3
userview/src/js/templates.js


+ 46 - 10
userview/src/less/app.details.new.less
View File 

@@ -24,6 +24,7 @@
 
     margin: auto;

     overflow: hidden;

     text-align: center;

+    position: relative;//

     #userHead{

         height: 230px;

         background: -o-linear-gradient(#96CEDF, #5EB0D2); /* Opera 11.1 - 12.0 */

@@ -49,7 +50,7 @@
 
             margin-left:5px; 

             font-family: "微软雅黑","宋体";

             >input {

-                width: 80%;

+                width: 100%;

                 margin-left: -4px; 

                 text-align: center;

                 text-shadow:0px 0px 2px #999;

@@ -66,24 +67,45 @@
 
             color: #fff;

             margin-top: 15px;

             font-size: 12px;

-            padding: 8px 10px;

-            text-shadow:0px 0px 2px #999;

+            padding: 8px;

+            text-shadow:0px 0px 2px #aaa;

             white-space: nowrap; /* 自适应宽度,不换行*/

             >input {

-                margin-left:-7px; 

+                margin-left:-7px;

+                margin-right: 8px;

                 border: none;

                 outline: none;

                 background: #7FC1D7;

-                width: 85%;

+                width: 82.5%;

                 white-space: nowrap;

                 overflow: hidden;

                 text-overflow: ellipsis;

                 text-shadow:0px 0px 2px #999;

             }

+            >a {

+                margin-left:-11px; 

+                color: #eee;

+                text-shadow:0px 0px 2px #999;

+                text-decoration:none;

+                &:hover {

+                    color:#ccc;

+                }

+            }

+            >marquee {

+                position: absolute;

+                top: 196px;

+                left:67px;

+                color: #fff;

+                font-family: "微软雅黑","宋体";

+                font-size: 12px;

+                text-align: left;

+                z-index: 1;

+                text-shadow:0px 0px 2px #777;

+            }

         }

     }

     #userInfo {

-        height: 430px;

+        height: 440px;

         margin-top:4px;

         background: #E8F4F8;

         #sInfo {

@@ -124,24 +146,28 @@
 
             >ul {

                 position: absolute;

                 list-style: none;

-                margin: 0px 30px 0px -10px;

+                margin-left: -10px;

                 #head {

                     width: 100px;

-                    padding-top:20px;

-                    padding-bottom: 30px;

+                    padding-top:15px;

+                    padding-bottom: 25px;

                     margin-left:-10px;  

                     text-align: left;

                     font-weight: bold;

                     font-size: 16px;

                 }

+                #main {

+                    padding-bottom: 25px;

+                }

                 >li {

                     width: 340px;

                     font-family: "微软雅黑","宋体";

-                    padding-bottom:19px;

+                    padding-bottom:20px;

                     text-align: left;

                     font-size: 12px;

                     color: #444;

                     white-space: nowrap; /* 自适应宽度,不换行*/

+                    overflow: hidden;

                     >input.lr {

                         margin-left: 40px;

                         border: none;

@@ -152,6 +178,16 @@
 
                         overflow: hidden;

                         text-overflow: ellipsis;

                     }

+                    textarea.lr {

+                        position: absolute;

+                        margin: -2px 0px 0px 40px;

+                        resize:none;

+                        border: none;

+                        outline: none;

+                        background: #E8F4F8;

+                        width: 70%;

+                        overflow:hidden;

+                    }

                 }

             }

         }

+ 3 - 3
userview/src/templates/details-new-info.html
View File 

@@ -1,9 +1,9 @@
 
 <div id="content">

     <ul>

         <li id="head">个人资料</li>

-        <li><span class="lf">单位名称</span> <input class="lr" type="text" readonly="readonly" title="{{user.comp}}" value="{{user.comp}}"></li>

-        <li><span class="lf">处室名称</span> <input class="lr" type="text" readonly="readonly" title="{{user.branch}}" value="{{user.branch}}"></li>

-        <li><span class="lf">职务名称</span> <input class="lr" type="text" readonly="readonly" title="{{user.duty}}" value="{{user.duty}}"></li>

+        <li id="main"><span class="lf">单位名称</span> <textarea rows="2" class="lr" type="text" readonly="readonly" title="{{user.comp}}">{{user.comp}}</textarea></li>

+        <li id="main"><span class="lf">处室名称</span> <textarea rows="2" class="lr" type="text" readonly="readonly" title="{{user.branch}}">{{user.branch}}</textarea></li>

+        <li id="main"><span class="lf">职务名称</span> <textarea rows="2" class="lr" type="text" readonly="readonly" title="{{user.duty}}">{{user.duty}}</textarea></li>

         <li><span class="lf">用户性别</span> <input class="lr" type="text" readonly="readonly" value="{{getSex()}}"></li>

         <li><span class="lf">办公电话</span> <input class="lr" type="text" readonly="readonly" value="{{user.tel}}"></li>

         <li><span class="lf">办公室号</span> <input class="lr" type="text" readonly="readonly" value="{{user.officeID}}"></li>

+ 6 - 2
userview/src/templates/details-new.html
View File 

@@ -4,9 +4,13 @@
 
             <img src="../img/DefaultHeadImage_96.png">

         </div>

         <span class="displayname"> <input type="text" readonly="readonly" value="{{user.name}}&nbsp;({{user.shortL}})"></span>

-        <div id="watch">

+        <div id="watch" ng-mouseleave="hover = false">

             <span>个性签名：</span>

-            <input type="text" readonly="readonly" class="watchword" title="{{user.watchword}}" value="{{user.watchword !== null && user.watchword !== undefined && user.watchword !== ''?user.watchword:'他什么都没有留下'}}">

+            <input type="text" readonly="readonly" value="{{user.watchword !== null && user.watchword !== undefined && user.watchword !== ''?user.watchword:'他什么都没有留下'}}">

+            <a href="" class="glyphicon glyphicon-forward" ng-click="hover = true"></a>

+            <marquee ng-if="hover" direction="left" behavior="scroll" scrollamount="4" scrolldelay="0" loop="-1" width="318" height="16" bgcolor="#7FC1D7" hspace="0" vspace="0">

+                {{user.watchword !== null && user.watchword !== undefined && user.watchword !== ''?user.watchword:'他什么都没有留下'}}

+            </marquee>

         </div>

     </div>

     <div id="userInfo">

+ 1 - 1
userview/src/templates/details.html
View File 

@@ -6,7 +6,7 @@
 
         <p>
 
             <span class="displayName">{{user.name}}（{{user.shortL}}）</span><br>
 
             <br>
 
-            <span>{{user.watchword !== null || user.watchword !== undefined || user.watchword !== ''?'他什么都没有留下':user.watchword}}</span><br>
 
+            <span>{{user.watchword !== null && user.watchword !== undefined && user.watchword !== ''?'他什么都没有留下':user.watchword}}</span><br>
 
         </p>
 
     </div>
 
     <div style="clear:both"></div>

+ 1 - 1
userview/temp/manifest/app-css-manifest.json
View File 

@@ -1,3 +1,3 @@
 
 {
 
-  "app.css": "app-9c39fee18b.css"
 
+  "app.css": "app-40912d635a.css"
 
 }

+ 1 - 1
userview/temp/manifest/app-js-manifest.json
View File 

@@ -1,3 +1,3 @@
 
 {
 
-  "app.js": "app-89ce62284b.js"
 
+  "app.js": "app-1a6ba9515a.js"
 
 }