diff options
author | Tao Shen <shentao@chinamobile.com> | 2016-10-10 02:13:37 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@open-o.org> | 2016-10-10 02:13:37 +0000 |
commit | 06b3d059f05212d647e176ef2644622ba8d68a4b (patch) | |
tree | f52e109888a7607b2bea37e539b50f7ba1a91b01 /openo-portal/portal-common/src/main | |
parent | 547d3c298f4d1fb2098e2232a9cf22c1dc375fd3 (diff) | |
parent | 8004db9ae141e537abefd0e95dce2210f2e56d56 (diff) |
Merge "modify main_page"
Diffstat (limited to 'openo-portal/portal-common/src/main')
14 files changed, 297 insertions, 850 deletions
diff --git a/openo-portal/portal-common/src/main/webapp/common/css/main_page.css b/openo-portal/portal-common/src/main/webapp/common/css/main_page.css new file mode 100644 index 00000000..87fe6cbc --- /dev/null +++ b/openo-portal/portal-common/src/main/webapp/common/css/main_page.css @@ -0,0 +1,48 @@ +/** + * Copyright 2016, CMCC Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +html, body { + margin: 0; + padding: 0; +} + +.layout { + padding-top:0px; +} + +body { + font-family: microsoft yahei !important; + background: #484747; +} + +.main-page-wrapper { + margin-left: 100px; + margin-right: 100px; +} + +.brick .row { + margin-right: 5px; + margin-left: 5px; + margin-top: 10px; +} + +.column{ + padding-left: 5px; + padding-right: 5px; +} + +a:hover{ + color:white; +} diff --git a/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-integration-i18n-en-US.properties b/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-integration-i18n-en-US.properties index 4449f97b..4c1ede27 100644 --- a/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-integration-i18n-en-US.properties +++ b/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-integration-i18n-en-US.properties @@ -13,198 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -com_zte_ums_ict_framework_ui_main_title= -com_zte_ums_ict_framework_ui_skin_select=Theme Color -com_zte_ums_ict_framework_ui_language=Language -com_zte_ums_ict_framework_ui_language_zhcn=中文 -com_zte_ums_ict_framework_ui_language_en=English -com_zte_ums_ict_framework_ui_skin_layout=Layout -com_zte_ums_ict_framework_ui_layout_fluid=Fluid -com_zte_ums_ict_framework_ui_layout_boxed=Boxed -com_zte_ums_ict_framework_ui_page_head=Header -com_zte_ums_ict_framework_ui_page_fixed=Fixed -com_zte_ums_ict_framework_ui_page_default=Default -com_zte_ums_ict_framework_ui_page_head_fixed=Fixed -com_zte_ums_ict_framework_ui_page_head_default=Default -com_zte_ums_ict_framework_ui_page_sidebar_fixed=Fixed -com_zte_ums_ict_framework_ui_page_sidebar_default=Default -com_zte_ums_ict_framework_ui_side_bar=Sidebar -com_zte_ums_ict_framework_ui_sidebar_location=Sidebar Position -com_zte_ums_ict_framework_ui_navbar_direction=Menu Direction -com_zte_ums_ict_framework_ui_navbar_direction_horizontal=Horizontal -com_zte_ums_ict_framework_ui_navbar_direction_vertical=Vertical -com_zte_ums_ict_framework_ui_navbar_direction_fmenu=Category Navigation -com_zte_ums_ict_framework_ui_keep_top=Top -com_zte_ums_ict_framework_ui_keep_left=Left -com_zte_ums_ict_framework_ui_keep_right=Right -com_zte_ums_ict_framework_ui_page_footer=Footer - -com_zte_ums_ict_framework_ui_basic_info=Basic Information -com_zte_ums_ict_framework_ui_search_value=Search... -com_zte_ums_ict_framework_ui_sidebar_mainPage=Home -com_zte_ums_ict_framework_ui_sidebar_topo=Topology -com_zte_ums_ict_framework_ui_sidebar_resList=Resource Table -com_zte_ums_ict_framework_ui_sidebar_physicTopo=Physical Topology -com_zte_ums_ict_framework_ui_sidebar_linkTopo=Relation Topology -com_zte_ums_ict_framework_ui_sidebar_alarm=Alarm -com_zte_ums_ict_framework_ui_sidebar_currentAlarm=Active Alarm -com_zte_ums_ict_framework_ui_sidebar_historyAlarm=History Alarm -com_zte_ums_ict_framework_ui_sidebar_notice=Notification -com_zte_ums_ict_framework_ui_sidebar_alarmRule=Alarm Rule -com_zte_ums_ict_framework_ui_sidebar_queryAlarm=Query Alarm -com_zte_ums_ict_framework_ui_sidebar_alarmStat=Alarm Statistic -com_zte_ums_ict_framework_ui_sidebar_alarmSetup=Alarm Setting -com_zte_ums_ict_framework_ui_sidebar_perform=Performance -com_zte_ums_ict_framework_ui_sidebar_historySearch=History Query -com_zte_ums_ict_framework_ui_sidebar_realTimeSearch=Realtime Data Query -com_zte_ums_ict_framework_ui_sidebar_counterAndIndicator=Counter and Index -com_zte_ums_ict_framework_ui_sidebar_measureTaskMang=Measurement Task -com_zte_ums_ict_framework_ui_sidebar_generalTemplateMang=Common Template -com_zte_ums_ict_framework_ui_sidebar_config=Configuration -com_zte_ums_ict_framework_ui_sidebar_itDevMang=IT Resource Management -com_zte_ums_ict_framework_ui_sidebar_ipDevMang=IP Resource Management -com_zte_ums_ict_framework_ui_sidebar_autoFind=Auto Discovery -com_zte_ums_ict_framework_ui_sidebar_pollConfig=Poll Configuration -com_zte_ums_ict_framework_ui_sidebar_security=Security -com_zte_ums_ict_framework_ui_sidebar_smGuide=security Entry -com_zte_ums_ict_framework_ui_sidebar_deptMang=Department Management -com_zte_ums_ict_framework_ui_sidebar_userMang=User Management -com_zte_ums_ict_framework_ui_sidebar_roleMang=Role Management -com_zte_ums_ict_framework_ui_sidebar_acccRule=Customize User Account Rule -com_zte_ums_ict_framework_ui_sidebar_roleAndRoleset=Role & Role Set -com_zte_ums_ict_framework_ui_sidebar_log=Log -com_zte_ums_ict_framework_ui_sidebar_operationLog=Operation Log -com_zte_ums_ict_framework_ui_sidebar_sysLog=System Log -com_zte_ums_ict_framework_ui_sidebar_securityLog=Security Log -com_zte_ums_ict_framework_ui_sidebar_sysLogMultiTab=System Log(Multi-tab Example) -com_zte_ums_ict_framework_ui_sidebar_operationLogMultiTab=Operation Log(Multi-tab Example) -com_zte_ums_ict_framework_ui_sidebar_system=System -com_zte_ums_ict_framework_ui_sidebar_dataBackup=Backup Data -com_zte_ums_ict_framework_ui_sidebar_fileBackup=Backup Files -com_zte_ums_ict_framework_ui_sidebar_license=License -com_zte_ums_ict_framework_ui_sidebar_sysState=System Status -com_zte_ums_ict_framework_ui_sidebar_SystemMang=System Management - -com_zte_ums_ict_framework_ui_sidebar_monitor=Monitor -com_zte_ums_ict_framework_ui_sidebar_alarmByCell=Active Alarm Statistic by NE -com_zte_ums_ict_framework_ui_sidebar_alarmByCellType=Active Alarm Statistic by NE Type -com_zte_ums_ict_framework_ui_breadcrumbs_moreOper=More Operation -com_zte_ums_ict_framework_ui_sidebar_dbStructBack=DB Struct Backup -com_zte_ums_ict_framework_ui_sidebar_baseDataBack=Base Data Backup -com_zte_ums_ict_framework_ui_sidebar_logDataBackRestore=Log Data Back&Restore -com_zte_ums_ict_framework_ui_sidebar_alarmDataBackRestore=Alarm Data Back&Restore -com_zte_ums_ict_framework_ui_sidebar_dbBack=Database Backup -com_zte_ums_ict_framework_ui_breadcrumbs_ruleSetup=Rule Setup -com_zte_ums_ngict_dashboard=Dashboard - -com_zte_ums_ict_framework_ui_sidebar_levelRedefineSetup=Severity Regrading Setting -com_zte_ums_ict_framework_ui_sidebar_disposeSuggestionSetup=Handing Suggestion Setting -com_zte_ums_ict_framework_ui_sidebar_AlarmBoxSetup=Set Alarm Box -com_zte_ums_ict_framework_ui_sidebar_measureObjectMang=MO Management -com_zte_ums_ict_framework_ui_sidebar_thresholdTaskMang=Threshold Task -com_zte_ums_ict_framework_ui_sidebar_anDevMan=AN Device Management -com_zte_ums_ict_framework_ui_sidebar_cellMang=Cell management -com_zte_ums_ict_framework_ui_sidebar_snmpPing= SNMP Ping -com_zte_ums_ict_framework_ui_sidebar_telnet=Telnet -com_zte_ums_ict_framework_ui_sidebar_workOder=Work Order -com_zte_ums_ict_framework_ui_sidebar_resMang=Resource Management -com_zte_ums_ict_framework_ui_sidebar_SecurityMang=Security Management -com_zte_ums_ict_framework_ui_sidebar_userLockStatus=Show Locked Users -com_zte_ums_ict_framework_ui_sidebar_loginUserMang=Login User Management -com_zte_ums_ict_framework_ui_sidebar_userBlackList=User Blacklist -com_zte_ums_ict_framework_ui_sidebar_operationSet=Operation Set Management -com_zte_ums_ict_framework_ui_sidebar_LogMang=Log Management -com_zte_ums_ict_framework_ui_sidebar_backRestore=Backup and Restore -com_zte_ums_ict_framework_ui_sidebar_dbStructBack=Backup Whole DB Structure -com_zte_ums_ict_framework_ui_sidebar_baseDataBack=Backup Basic Data -com_zte_ums_ict_framework_ui_sidebar_logDataBackRestore=Log Data Backup and Restore -com_zte_ums_ict_framework_ui_sidebar_alarmDataBackRestore=Alarm Data Backup and Restore -com_zte_ums_ict_framework_ui_loading=loading...... -com_zte_ums_ict_framework_ui_searching=searching...... -com_zte_ums_ict_framework_ui_clickTooFast=You click on too fast, please wait for a while to click the menu, thank you! -com_zte_ums_ict_framework_ui_loadmenuerror=loading menu failed. -com_zte_ums_ict_framework_ui_confirmlogout=Do you confirm to logout? -com_zte_ums_aos_framework_ui_heartbeat_fail=The session is invalidated. -com_zte_ums_ict_framework_ui_fixedsidedefaultheaderError=Default Header with Fixed Sidebar option is not supported. Proceed with Fixed Header with Fixed Sidebar. -com_zte_ums_ict_framework_ui_fixedsiderightpositionError=Fixed Sidebar with right position is not supported. Set Sidebar as default. -com_zte_ums_ict_framework_ui_loadchgpwdpageError=loading change password page failed. -com_zte_ums_ict_framework_ui_searchmessage=The {0} keyword search results as follows: -com_zte_ums_ict_framework_ui_month=January,February,March,April,May,June,July,August,September,October,November,December -com_zte_ums_ict_framework_ui_customdate=Custom date -com_zte_ums_ict_framework_ui_from=From -com_zte_ums_ict_framework_ui_to=To -com_zte_ums_ict_framework_ui_apply=Apply -com_zte_ums_ict_framework_ui_today=Today -com_zte_ums_ict_framework_ui_yestoday=Yestoday -com_zte_ums_ict_framework_ui_lastdays=Last {0} days -com_zte_ums_ict_framework_ui_thismonth=This month -com_zte_ums_ict_framework_ui_lastmonth=Last month - -com_zte_ums_ict_framework_ui_group_about=About -com_zte_ums_ict_framework_ui_group_logout=Logout -com_zte_ums_ict_framework_ui_changePwd=Change Password -com_zte_ums_ict_framework_ui_group_fullscreen=Full Screen -com_zte_ums_ict_framework_ui_group_exitfullscreen=Exit Full Screen -com_zte_ums_ict_framework_moudle_help = Help -com_zte_ums_ict_framework_moudle_menutoggler=More - - -com_zte_ums_ict_alarmcount_total_label = Total:{0} -com_zte_ums_ict_alarmcount_critical_label = Critical:{0} -com_zte_ums_ict_alarmcount_critical_text = Critical Alarm -com_zte_ums_ict_alarmcount_major_label = Major:{0} -com_zte_ums_ict_alarmcount_major_text = Major Alarm -com_zte_ums_ict_alarmcount_minor_label = Minor:{0} -com_zte_ums_ict_alarmcount_minor_text = Minor Alarm -com_zte_ums_ict_alarmcount_warning_label = Warning:{0} -com_zte_ums_ict_alarmcount_warning_text = Warning Alarm -com_zte_ums_ict_alarmcount_none_label=No alarm Now! -com_zte_ums_ict_alarmcount_total_after_text = ,Now!" -com_zte_ums_ict_alarmcount_total_before_text =Total Alarm Number: - -com_zte_ums_ict_framework_ui_sidebar_performMonitor=Perform Monitor -com_zte_ums_ict_framework_ui_sidebar_resource=Resource -com_zte_ums_ict_framework_ui_sidebar_manualAdd=Manual Add -com_zte_ums_ict_framework_ui_sidebar_gisTopo=GIS Topo - - -com_zte_ums_ict_framework_ui_sidebar_userDispatch=User Dispatch -com_zte_ums_ict_framework_ui_sidebar_roleCollect=Role Collection - -com_zte_ums_ict_sm_user_op_ok=Operation succeeded. -com_zte_ums_ict_sm_user_close_button=Close -com_zte_ums_ict_sm_user_confirm=OK -com_zte_ums_ict_sm_user_ok=OK -com_zte_ums_ict_sm_user_modify_current_password_label= User Password Set -com_zte_ums_ict_sm_user_modify_current_password=User Password Set -com_zte_ums_ict_sm_user_old_password=Old Password -com_zte_ums_ict_sm_user_confirmpassword=Confirm New Password -com_zte_ums_ict_sm_user_cancel_button=Cancel -com_zte_ums_ict_sm_user_password=New Password -com_zte_ums_ict_sm_password_confirm_not_consistent = The New Password and the Confirm New Password are inconsistent. -com_zte_ums_ict_sm_user_inputoldpwd=Please input old password -com_zte_ums_ict_sm_user_inputnewpwd=Please input new password -com_zte_ums_ict_sm_user_inputnewpwdagain=Please input new password again -com_zte_ums_ict_portal_chgpwd_oldpwdError=Old password error -com_zte_ums_ict_login_inputname=Please input user name -com_zte_ums_ict_login_inputpwd=Please input user password - -com_zte_ums_eco_service=Service - -com_zte_ums_ict_framework_ui_ztebluelight=ZTE Blue Light -com_zte_ums_ict_framework_ui_zteblue=ZTE Blue -com_zte_ums_ict_framework_ui_blue=Blue - -com_zte_ums_ict_about_ppu_field_name =Name -com_zte_ums_ict_about_ppu_field_version = Version -com_zte_ums_ict_about_ppu_field_desc = Description -com_zte_ums_ict_about_ppu_field_time = Update Time -com_zte_ums_ict_framework_moudle_about = About -com_zte_ums_ict_framework_about_detail = Info -com_zte_ums_ict_framework_about_version=Version: -com_zte_ums_ict_portal_login_companyName=2015 @; ZTE - Corporation - -com_zte_ums_ict_framework_ui_main_title= -com_zte_ums_ict_framework_ui_page_title=NFV Mano System -com_zte_ums_ict_framework_ui_page_title_1=NFV Mano System -com_zte_ums_ict_framework_ui_page_title_2=NFV Mano System
\ No newline at end of file +openo_main_page_title=OPEN-O System +org_openo_orchestrator_framework_main_page_service=Service +org_openo_orchestrator_framework_main_page_cloud=Cloud +org_openo_orchestrator_framework_main_page_orchestrator=Orchestrator +org_openo_orchestrator_framework_main_page_monitor=Monitor +org_openo_orchestrator_framework_main_page_resource=Resource +org_openo_orchestrator_framework_main_page_design=Design +org_openo_orchestrator_framework_main_page_alarm=Alarm +org_openo_orchestrator_framework_main_page_performance=Performance diff --git a/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-integration-i18n-zh-CN.properties b/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-integration-i18n-zh-CN.properties deleted file mode 100644 index 7d86d365..00000000 --- a/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-integration-i18n-zh-CN.properties +++ /dev/null @@ -1,210 +0,0 @@ -# -# Copyright 2016, CMCC Technologies Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -com_zte_ums_ict_framework_ui_main_title= -com_zte_ums_ict_framework_ui_skin_select=皮肤选择 -com_zte_ums_ict_framework_ui_language=语言 -com_zte_ums_ict_framework_ui_language_zhcn=中文 -com_zte_ums_ict_framework_ui_language_en=English -com_zte_ums_ict_framework_ui_skin_layout=布局 -com_zte_ums_ict_framework_ui_layout_fluid=流动布局 -com_zte_ums_ict_framework_ui_layout_boxed=盒子布局 -com_zte_ums_ict_framework_ui_page_head=页头 -com_zte_ums_ict_framework_ui_page_fixed=固定 -com_zte_ums_ict_framework_ui_page_default=默认 -com_zte_ums_ict_framework_ui_page_head_fixed=固定 -com_zte_ums_ict_framework_ui_page_head_default=默认 -com_zte_ums_ict_framework_ui_page_sidebar_fixed=固定 -com_zte_ums_ict_framework_ui_page_sidebar_default=默认 -com_zte_ums_ict_framework_ui_side_bar=边栏 -com_zte_ums_ict_framework_ui_sidebar_location=边栏位置 -com_zte_ums_ict_framework_ui_navbar_direction=菜单方向 -com_zte_ums_ict_framework_ui_navbar_direction_horizontal=横向 -com_zte_ums_ict_framework_ui_navbar_direction_vertical=纵向 -com_zte_ums_ict_framework_ui_navbar_direction_fmenu=分类导航 -com_zte_ums_ict_framework_ui_keep_top=靠上 -com_zte_ums_ict_framework_ui_keep_left=靠左 -com_zte_ums_ict_framework_ui_keep_right=靠右 -com_zte_ums_ict_framework_ui_page_footer=页脚 - -com_zte_ums_ict_framework_ui_basic_info=基本信息 -com_zte_ums_ict_framework_ui_search_value=搜索... -com_zte_ums_ict_framework_ui_sidebar_mainPage=主页 -com_zte_ums_ict_framework_ui_sidebar_topo=拓扑 -com_zte_ums_ict_framework_ui_sidebar_resList=资源列表 -com_zte_ums_ict_framework_ui_sidebar_physicTopo=物理拓扑 -com_zte_ums_ict_framework_ui_sidebar_linkTopo=链路拓扑 -com_zte_ums_ict_framework_ui_sidebar_alarm=告警 -com_zte_ums_ict_framework_ui_sidebar_alarm_summary=告警概览 -com_zte_ums_ict_framework_ui_sidebar_currentAlarm=当前告警 -com_zte_ums_ict_framework_ui_sidebar_historyAlarm=历史告警 -com_zte_ums_ict_framework_ui_sidebar_notice=通知 -com_zte_ums_ict_framework_ui_sidebar_alarmRule=告警规则 -com_zte_ums_ict_framework_ui_sidebar_queryAlarm=告警查询 -com_zte_ums_ict_framework_ui_sidebar_alarmStat=告警统计 -com_zte_ums_ict_framework_ui_sidebar_alarmSetup=告警设置 -com_zte_ums_ict_framework_ui_sidebar_perform=性能 -com_zte_ums_ict_framework_ui_sidebar_historySearch=历史查询 -com_zte_ums_ict_framework_ui_sidebar_realTimeSearch=实时查询 -com_zte_ums_ict_framework_ui_sidebar_counterAndIndicator=计数器与指标 -com_zte_ums_ict_framework_ui_sidebar_measureTaskMang=测量任务管理 -com_zte_ums_ict_framework_ui_sidebar_generalTemplateMang=通用模板管理 -com_zte_ums_ict_framework_ui_sidebar_config=配置 -com_zte_ums_ict_framework_ui_sidebar_itDevMang=IT设备管理 -com_zte_ums_ict_framework_ui_sidebar_ipDevMang=IP设备管理 -com_zte_ums_ict_framework_ui_sidebar_autoFind=自动发现 -com_zte_ums_ict_framework_ui_sidebar_pollConfig=轮询设置 -com_zte_ums_ict_framework_ui_sidebar_security=安全 -com_zte_ums_ict_framework_ui_sidebar_smGuide=安全入门 -com_zte_ums_ict_framework_ui_sidebar_deptMang=部门管理 -com_zte_ums_ict_framework_ui_sidebar_userMang=用户管理 -com_zte_ums_ict_framework_ui_sidebar_acccRule=帐户规则 -com_zte_ums_ict_framework_ui_sidebar_roleMang=角色管理 -com_zte_ums_ict_framework_ui_sidebar_roleAndRoleset=角色和角色集 -com_zte_ums_ict_framework_ui_sidebar_log=日志 -com_zte_ums_ict_framework_ui_sidebar_operationLog=操作日志 -com_zte_ums_ict_framework_ui_sidebar_sysLog=系统日志 -com_zte_ums_ict_framework_ui_sidebar_securityLog=安全日志 -com_zte_ums_ict_framework_ui_sidebar_sysLogMultiTab=系统日志(多TAB示例) -com_zte_ums_ict_framework_ui_sidebar_operationLogMultiTab=操作日志(多TAB示例) -com_zte_ums_ict_framework_ui_sidebar_system=系统 -com_zte_ums_ict_framework_ui_sidebar_dataBackup=数据备份 -com_zte_ums_ict_framework_ui_sidebar_fileBackup=文件备份 -com_zte_ums_ict_framework_ui_sidebar_license=许可证 -com_zte_ums_ict_framework_ui_sidebar_sysState=系统状态 -com_zte_ums_ict_framework_ui_sidebar_SystemMang=系统管理 - -com_zte_ums_ict_framework_ui_sidebar_monitor=监控 -com_zte_ums_ict_framework_ui_sidebar_alarmByCell=按网元统计告警 -com_zte_ums_ict_framework_ui_sidebar_alarmByCellType=按网元类型统计告警 -com_zte_ums_ict_framework_ui_breadcrumbs_moreOper=更多操作 -com_zte_ums_ict_framework_ui_sidebar_dbStructBack=整库结构备份 -com_zte_ums_ict_framework_ui_sidebar_baseDataBack=基础数据备份 -com_zte_ums_ict_framework_ui_sidebar_logDataBackRestore=日志数据备份恢复 -com_zte_ums_ict_framework_ui_sidebar_alarmDataBackRestore=告警数据备份恢复 -com_zte_ums_ict_framework_ui_sidebar_dbBack=数据库备份 -com_zte_ums_ngict_dashboard=仪表盘 -com_zte_ums_ict_framework_ui_breadcrumbs_ruleSetup=规则设置 -com_zte_ums_ict_framework_ui_sidebar_levelRedefineSetup=级别重定义设置 -com_zte_ums_ict_framework_ui_sidebar_disposeSuggestionSetup=处理建议设置 -com_zte_ums_ict_framework_ui_sidebar_AlarmBoxSetup=告警箱设置 -com_zte_ums_ict_framework_ui_sidebar_measureObjectMang=测量对象管理 - -com_zte_ums_ict_framework_ui_sidebar_thresholdTaskMang=门限任务管理 -com_zte_ums_ict_framework_ui_sidebar_anDevMan=AN产品管理 -com_zte_ums_ict_framework_ui_sidebar_cellMang=网元管理 -com_zte_ums_ict_framework_ui_sidebar_snmpPing= SNMP Ping -com_zte_ums_ict_framework_ui_sidebar_telnet=Telnet -com_zte_ums_ict_framework_ui_sidebar_workOder=工单管理 -com_zte_ums_ict_framework_ui_sidebar_resMang=资源管理 -com_zte_ums_ict_framework_ui_sidebar_SecurityMang=安全管理 -com_zte_ums_ict_framework_ui_sidebar_operationSet=操作集管理 -com_zte_ums_ict_framework_ui_sidebar_userLockStatus=用户锁定情况 -com_zte_ums_ict_framework_ui_sidebar_loginUserMang=登录用户管理 -com_zte_ums_ict_framework_ui_sidebar_userBlackList=用户黑名单 -com_zte_ums_ict_framework_ui_sidebar_operationSet=操作集 -com_zte_ums_ict_framework_ui_sidebar_LogMang=日志管理 -com_zte_ums_ict_framework_ui_sidebar_backRestore=备份恢复 -com_zte_ums_ict_framework_ui_sidebar_dbStructBack=整库结构备份 -com_zte_ums_ict_framework_ui_sidebar_baseDataBack=基础数据备份 -com_zte_ums_ict_framework_ui_sidebar_logDataBackRestore=日志数据备份恢复 -com_zte_ums_ict_framework_ui_sidebar_alarmDataBackRestore=告警数据备份恢复 -com_zte_ums_ict_framework_ui_loading=加载中...... -com_zte_ums_ict_framework_ui_searching=搜索中...... -com_zte_ums_ict_framework_ui_clickTooFast=您点击的太快了,请稍候重新点击下该菜单,谢谢 -com_zte_ums_ict_framework_ui_loadmenuerror=菜单加载失败 -com_zte_ums_ict_framework_ui_confirmlogout=你确认要注销吗? -com_zte_ums_aos_framework_ui_heartbeat_fail=会话已经失效。 -com_zte_ums_ict_framework_ui_fixedsidedefaultheaderError=页头不支持固定边栏,先固定页头才能固定边栏. -com_zte_ums_ict_framework_ui_fixedsiderightpositionError=固定边栏不支持边栏靠右,先设置边栏为默认. -com_zte_ums_ict_framework_ui_loadchgpwdpageError=加载修改密码页面失败 -com_zte_ums_ict_framework_ui_searchmessage=关键字{0}的搜索结果如下: -com_zte_ums_ict_framework_ui_month=一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月 -com_zte_ums_ict_framework_ui_customdate=自定义日期 -com_zte_ums_ict_framework_ui_from=从 -com_zte_ums_ict_framework_ui_to=到 -com_zte_ums_ict_framework_ui_apply=应用 -com_zte_ums_ict_framework_ui_today=今天 -com_zte_ums_ict_framework_ui_yestoday=昨天 -com_zte_ums_ict_framework_ui_lastdays=最近{0}天 -com_zte_ums_ict_framework_ui_thismonth=本月 -com_zte_ums_ict_framework_ui_lastmonth=上个月 -com_zte_ums_ict_framework_ui_group_about=关于 - -com_zte_ums_ict_framework_ui_group_logout=注销 -com_zte_ums_ict_framework_ui_changePwd=修改密码 -com_zte_ums_ict_framework_ui_group_fullscreen=全屏 -com_zte_ums_ict_framework_ui_group_exitfullscreen=退出全屏 -com_zte_ums_ict_framework_moudle_help = 帮助 -com_zte_ums_ict_framework_moudle_menutoggler=更多... - -com_zte_ums_ict_alarmcount_total_label = 总计:{0} -com_zte_ums_ict_alarmcount_critical_label = 严重:{0} -com_zte_ums_ict_alarmcount_critical_text = 严重告警 -com_zte_ums_ict_alarmcount_major_label = 主要:{0} -com_zte_ums_ict_alarmcount_major_text = 主要告警 -com_zte_ums_ict_alarmcount_minor_label = 次要:{0} -com_zte_ums_ict_alarmcount_minor_text = 次要告警 -com_zte_ums_ict_alarmcount_warning_label = 警告:{0} -com_zte_ums_ict_alarmcount_warning_text = 警告告警 -com_zte_ums_ict_alarmcount_none_label=当前系统无告警 -com_zte_ums_ict_alarmcount_total_before_text =当前系统共有 -com_zte_ums_ict_alarmcount_total_after_text =个告警 - -com_zte_ums_ict_framework_ui_sidebar_performMonitor=性能监视 -com_zte_ums_ict_framework_ui_sidebar_resource=资源 -com_zte_ums_ict_framework_ui_sidebar_manualAdd=手动添加 -com_zte_ums_ict_framework_ui_sidebar_gisTopo=GIS拓扑 - - -com_zte_ums_ict_framework_ui_sidebar_userDispatch=用户分发 -com_zte_ums_ict_framework_ui_sidebar_roleCollect=角色收集 - -com_zte_ums_ict_sm_user_op_ok=操作成功。 -com_zte_ums_ict_sm_user_close_button=关闭 -com_zte_ums_ict_sm_user_confirm=确定 -com_zte_ums_ict_sm_user_ok=确定 -com_zte_ums_ict_sm_user_modify_current_password_label= 当前用户密码设置 -com_zte_ums_ict_sm_user_modify_current_password=当前用户密码设置 -com_zte_ums_ict_sm_user_old_password=旧密码 -com_zte_ums_ict_sm_user_confirmpassword=确认新密码 -com_zte_ums_ict_sm_user_cancel_button=取消 -com_zte_ums_ict_sm_user_password=新密码 -com_zte_ums_ict_sm_password_confirm_not_consistent = 密码输入不一致 -com_zte_ums_ict_sm_user_inputoldpwd=请输入原密码 -com_zte_ums_ict_sm_user_inputnewpwd=请输入新密码 -com_zte_ums_ict_sm_user_inputnewpwdagain=请再次输入新密码 -com_zte_ums_ict_portal_chgpwd_oldpwdError=原始密码错误 -com_zte_ums_ict_login_inputname=请输入用户名 -com_zte_ums_ict_login_inputpwd=请输入密码 - -com_zte_ums_eco_service=业务 - -com_zte_ums_ict_framework_ui_blue=中兴蓝3 -com_zte_ums_ict_framework_ui_ztebluelight=中兴蓝1 -com_zte_ums_ict_framework_ui_zteblue=中兴蓝2 - -com_zte_ums_ict_about_ppu_field_name = 名称 -com_zte_ums_ict_about_ppu_field_version = 版本号 -com_zte_ums_ict_about_ppu_field_desc = 描述 -com_zte_ums_ict_about_ppu_field_time = 更新时间 -com_zte_ums_ict_framework_moudle_about = 关于 -com_zte_ums_ict_framework_about_detail = 详情 -com_zte_ums_ict_framework_about_version=版本号: -com_zte_ums_ict_portal_login_companyName=2015 © ZTE - 中兴通讯股份有限公司 - -com_zte_ums_ict_framework_ui_main_title= -com_zte_ums_ict_framework_ui_page_title=虚拟化管理编排系统 -com_zte_ums_ict_framework_ui_page_title_2=虚拟化管理编排系统 diff --git a/openo-portal/portal-common/src/main/webapp/common/i18n/web-portal-login-integration-i18n-en-US.properties b/openo-portal/portal-common/src/main/webapp/common/i18n/web-portal-login-integration-i18n-en-US.properties index d84c00d7..4698f5d3 100644 --- a/openo-portal/portal-common/src/main/webapp/common/i18n/web-portal-login-integration-i18n-en-US.properties +++ b/openo-portal/portal-common/src/main/webapp/common/i18n/web-portal-login-integration-i18n-en-US.properties @@ -13,37 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # - - -com_zte_ums_ict_portal_login_title=OPEN-O System -com_zte_ums_ict_portal_login_welcome=Welcome -com_zte_ums_ict_portal_login_userPassword=User Name or Password Error -inputUserName=Please Input User Name -inputPassword=Please Input Password -com_zte_ums_ict_portal_login_rememberMe=Remember Me -com_zte_ums_ict_login_inputname=Please Input User Name -com_zte_ums_ict_login_inputpwd=Please Input Password -com_zte_ums_aos_portal_login_username=Username: -com_zte_ums_aos_portal_login_password=Password: -com_zte_ums_aos_portal_login_validateCode=Validate Code: -com_zte_ums_aos_portal_login_login=Login -com_zte_ums_aos_portal_login_reset=Reset -com_zte_ums_aos_portal_login_notice=To make your experience more smoothly and better, please download the lastest browser(Windows 32bit): -com_zte_ums_aos_portal_login_group_localdownload=Local download -com_zte_ums_aos_portal_login_group_officialdownload=Official download -com_zte_ums_aos_portal_ui_changePwd=Change Password -com_zte_ums_aos_sm_user_op_ok=Operation succeeded. -com_zte_ums_aos_sm_user_close_button=Close -com_zte_ums_aos_sm_user_confirm=Confirm -com_zte_ums_aos_login_warning_title = Warning -com_zte_ums_aos_sm_user_modify_current_password_label= User Password Set -com_zte_ums_aos_sm_user_modify_current_password=User Password Set -com_zte_ums_aos_sm_user_old_password=Old Password -com_zte_ums_aos_sm_user_confirmpassword=Confirm Password -com_zte_ums_aos_sm_user_cancel_button=Cancel -com_zte_ums_aos_sm_user_password=New Password -com_zte_ums_aos_sm_password_confirm_not_consistent = password and confirm password is not the same. -com_zte_ums_aos_portal_login_group_download = Download -com_zte_ums_aos_portal_login_notice_about_chromeFrame=Please download and install the following browser.Otherwise, some functions may become exceptional. -com_zte_ums_aos_portal_login_recommend_notice=Recommend the use of IE8, IE9, IE10, Chrome27, Firefox20.1 browser, recommend the display resolution: 1280 * 800. -com_zte_ums_ict_portal_login_serv_error=Login Error +openo_login_title=OPEN-O System +openo_login_welcome=Welcome +openo_login_userPassword=User Name or Password Error +openo_input_userName=Please Input User Name +openo_input_password=Please Input Password +openo_login_rememberMe=Remember Me +openo_login_username=Username: +openo_login_password=Password: +openo_login_login=Login +openo_login_error=Login Error diff --git a/openo-portal/portal-common/src/main/webapp/common/i18n/web-portal-login-integration-i18n-zh-CN.properties b/openo-portal/portal-common/src/main/webapp/common/i18n/web-portal-login-integration-i18n-zh-CN.properties deleted file mode 100644 index 3fc18d9f..00000000 --- a/openo-portal/portal-common/src/main/webapp/common/i18n/web-portal-login-integration-i18n-zh-CN.properties +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright 2016, CMCC Technologies Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -com_zte_ums_ict_portal_login_title=ICT管理系统 -com_zte_ums_ict_portal_login_welcome=欢迎登录 -com_zte_ums_ict_portal_login_userPassword=用户名和密码错误 -inputUserName=请输入用户名 -inputPassword=请输入密码 -com_zte_ums_ict_portal_login_rememberMe=记住我 -com_zte_ums_ict_login_inputname=请输入用户名 -com_zte_ums_ict_login_inputpwd=请输入密码 -com_zte_ums_aos_portal_login_username=用户名: -com_zte_ums_aos_portal_login_password=密 码: -com_zte_ums_aos_portal_login_validateCode=验证码: -com_zte_ums_aos_portal_login_login=登录 -com_zte_ums_aos_portal_login_reset=重置 -com_zte_ums_aos_portal_login_notice=为了有更好更流畅的操作体验,请更新到最新的浏览器,请下载(Windows 32位): -com_zte_ums_aos_portal_login_group_localdownload=本地下载 -com_zte_ums_aos_portal_login_group_officialdownload=官方下载 -com_zte_ums_aos_portal_ui_changePwd=修改密码 -com_zte_ums_aos_sm_user_op_ok=操作成功。 -com_zte_ums_aos_sm_user_close_button=关闭 -com_zte_ums_aos_sm_user_confirm=确定 -com_zte_ums_aos_login_warning_title = 警告 -com_zte_ums_aos_sm_user_modify_current_password_label= 当前用户密码设置 -com_zte_ums_aos_sm_user_modify_current_password=当前用户密码设置 -com_zte_ums_aos_sm_user_old_password=旧密码 -com_zte_ums_aos_sm_user_confirmpassword=确认密码 -com_zte_ums_aos_sm_user_cancel_button=取消 -com_zte_ums_aos_sm_user_password=新密码 -com_zte_ums_aos_sm_password_confirm_not_consistent = 密码输入不一致。 -com_zte_ums_aos_portal_login_group_download = 下载 -com_zte_ums_aos_portal_login_notice_about_chromeFrame=为了不影响系统的功能正常使用,请连网安装并使用下面的浏览器: -com_zte_ums_aos_portal_login_recommend_notice=推荐使用IE8及以上、Chrome27及以上、Firefox20.1及以上版本浏览器,推荐显示分辨率:1280×800。 -com_zte_ums_ict_portal_login_serv_error=登录异常 diff --git a/openo-portal/portal-common/src/main/webapp/common/js/core/const.js b/openo-portal/portal-common/src/main/webapp/common/js/core/const.js index fc1e69bd..d8a3371e 100644 --- a/openo-portal/portal-common/src/main/webapp/common/js/core/const.js +++ b/openo-portal/portal-common/src/main/webapp/common/js/core/const.js @@ -25,7 +25,7 @@ var IS_V5_TESTVERSION = true; var FrameConst={}; //Ĭϵ¼ɹתҳ -FrameConst.DEFAULT_LOGINSKIP_PAGE = "main-page.html"; +FrameConst.DEFAULT_LOGINSKIP_PAGE = "common/main-page.html"; FrameConst.do_heartbeat = false; FrameConst.change_pass = false; diff --git a/openo-portal/portal-common/src/main/webapp/common/js/international/loadi18n-login.js b/openo-portal/portal-common/src/main/webapp/common/js/international/loadi18n-login.js index bdbb4057..ac9f77e0 100644 --- a/openo-portal/portal-common/src/main/webapp/common/js/international/loadi18n-login.js +++ b/openo-portal/portal-common/src/main/webapp/common/js/international/loadi18n-login.js @@ -20,7 +20,7 @@ function loadProperties_login(lang) { path:'./common/i18n/', mode:'map', callback: function() { - var i18nItems = $('[name_i18n=com_zte_ums_ict_framework_ui_i18n_login]'); + var i18nItems = $('[name_i18n=openo_login_i18n_login]'); for (var i = 0; i < i18nItems.length; i++) { var $item = $(i18nItems.eq(i)); var itemId = $item.attr('id'); diff --git a/openo-portal/portal-common/src/main/webapp/common/js/international/loadi18n.js b/openo-portal/portal-common/src/main/webapp/common/js/international/loadi18n.js index d62dbbd9..adfcbb98 100644 --- a/openo-portal/portal-common/src/main/webapp/common/js/international/loadi18n.js +++ b/openo-portal/portal-common/src/main/webapp/common/js/international/loadi18n.js @@ -14,97 +14,55 @@ * limitations under the License. */ var lang = getLanguage(); -//lang = 'en-US'; -//加载主页面head部分国际化 -function loadProperties(lang){ - jQuery.i18n.properties({ - language:lang, - name:'web-framework-integration-i18n', - path:'i18n/', // 资源文件路径 - mode:'map', // 用 Map 的方式使用资源文件中的值 - callback: function() {// 加载成功后设置显示内容 - var i18nItems = $('[name_i18n=com_zte_ums_ict_framework_ui_i18n]'); - for(var i=0;i<i18nItems.length;i++){ - var $item = $(i18nItems.eq(i)); - var itemId = $item.attr('id'); - if(typeof($item.attr("title"))!="undefined"){ +function loadProperties(lang) { + jQuery.i18n.properties({ + language:lang, + name:'web-framework-integration-i18n', + path:'./common/i18n/', + mode:'map', + callback: function() { + var i18nItems = $('[name_i18n=openo_main_page_i18n]'); + for (var i = 0; i < i18nItems.length; i++) { + var $item = $(i18nItems.eq(i)); + var itemId = $item.attr('id'); + if (typeof($item.attr("title")) != "undefined") { $item.attr("title", $.i18n.prop(itemId)); - }else{ + } else { $item.text($.i18n.prop(itemId)); } - } - } - }); + } + } + }); } -function loadi18n_WebFramework_1(){ - $.getScript("js/tools.js", function(){ - var lang = getLanguage(); - loadProperties(lang); - }); +function loadi18n_WebFramework() { + loadProperties(lang); } -function loadi18n_WebFramework(){ - loadProperties(lang); -} - -/* -function loadPropertiesSideMenu(lang){ - jQuery.i18n.properties({ - language:lang, - name:'web-framework-i18n', - path:'i18n/', // 资源文件路径 - mode:'map', // 用 Map 的方式使用资源文件中的值 - callback: function() {// 加载成功后设置显示内容 - var i18nItems = $('[name=com_zte_ums_ict_framework_ui_i18n]'); - for(var i=0;i<i18nItems.length;i++){ - var $item = $(i18nItems.eq(i)); - var itemId = $item.attr('id'); - if(typeof($item.attr("placeholder"))=="undefined"){ - $item.text($.i18n.prop(itemId)); - }else{ - $item.attr("placeholder", $.i18n.prop(itemId)); - } - } - } - }); -}*/ - -/** -* 国际化资源文件加载函数; -* 相应参数为当前语言(由框架从后端取得),国际化资源文件名前缀,资源文件所在路径。 -*/ -/** -* 国际化资源文件加载函数; -* 相应参数为当前语言(由框架从后端取得),国际化资源文件名前缀,资源文件所在路径。 -*/ -function loadPropertiesSideMenu(lang, propertiesFileNamePrefix, propertiesFilePath , name_I18n){ - console.info('loadPropertiesSideMenu has been called ' + propertiesFilePath); - if(!name_I18n) name_I18n='com_zte_ums_ict_framework_ui_i18n_sideMenu'; - jQuery.i18n.properties({ - language:lang, - name:propertiesFileNamePrefix, - path:propertiesFilePath, // 资源文件路径 - mode:'map', // 用 Map 的方式使用资源文件中的值 - callback: function() {// 加载成功后设置显示内容 +function loadPropertiesSideMenu(lang, propertiesFileNamePrefix, propertiesFilePath , name_I18n) { + if(!name_I18n) name_I18n='openo_main_page_i18n'; + jQuery.i18n.properties({ + language:lang, + name:propertiesFileNamePrefix, + path:propertiesFilePath, + mode:'map', + callback: function() { var i18nItems = $('[name_i18n='+ name_I18n + ']'); - for(var i=0;i<i18nItems.length;i++){ - var $item = $(i18nItems.eq(i)); - var itemId = $item.attr('id'); - if(typeof($item.attr("placeholder"))=="undefined"){ + for (var i = 0; i < i18nItems.length; i++) { + var $item = $(i18nItems.eq(i)); + var itemId = $item.attr('id'); + if (typeof($item.attr("placeholder")) == "undefined") { $item.text($.i18n.prop(itemId)); - }else{ + } else { $item.attr("placeholder", $.i18n.prop(itemId)); } - } - } - }); + } + } + }); } -function loadi18n_WebFramework_sideMenu(){ - //默认0场景菜单资源文件 - //loadPropertiesSideMenu(lang, 'web-framework-i18n', 'i18n/'); - //加载各应用菜单资源文件 +function loadi18n_WebFramework_sideMenu() { var srcpath ="i18n/"; - loadPropertiesSideMenu(lang , 'web-framework-integration-i18n', srcpath);} + loadPropertiesSideMenu(lang , 'web-framework-integration-i18n', srcpath); +} diff --git a/openo-portal/portal-common/src/main/webapp/common/js/login.js b/openo-portal/portal-common/src/main/webapp/common/js/login.js index 9e2e7f3a..ccc150a4 100644 --- a/openo-portal/portal-common/src/main/webapp/common/js/login.js +++ b/openo-portal/portal-common/src/main/webapp/common/js/login.js @@ -19,8 +19,8 @@ String.prototype.trim = function() { function loginSubmitHandler(form) { var params = {}; - params["username"] = $("#inputUserName").val().trim(); - var sourcePass = $("#inputPassword").val(); + params["username"] = $("#openo_input_userName").val().trim(); + var sourcePass = $("#openo_input_password").val(); var pass = sourcePass; if (FrameConst.isEncypt === "true") { pass = ict_framework_func1(pass); @@ -28,27 +28,28 @@ function loginSubmitHandler(form) { params["password"] = pass; params["isEncypted"] = FrameConst.isEncypt; saveUserInfo(params); + location.href = FrameConst.DEFAULT_LOGINSKIP_PAGE; - $.ajax({ - url : FrameConst.REST_LOGIN, - type : 'POST', - data : JSON.stringify(params), - dataType : 'json', - contentType : 'application/json; charset=utf-8', - success : function(data, status, xhr) { - if (data.result == 0) { - var epass = CryptoJS.MD5(params.username+sourcePass); - store("icttka", epass.toLocaleString()); - } - processLoginResult(data,params); - }, - Error : function(xhr, error, exception) { - if (console) { - console.log("login fail:" + error); - console.log(exception); - } - } - }); +// $.ajax({ +// url : FrameConst.REST_LOGIN, +// type : 'POST', +// data : JSON.stringify(params), +// dataType : 'json', +// contentType : 'application/json; charset=utf-8', +// success : function(data, status, xhr) { +// if (data.result == 0) { +// var epass = CryptoJS.MD5(params.username+sourcePass); +// store("icttka", epass.toLocaleString()); +// } +// processLoginResult(data, params); +// }, +// Error : function(xhr, error, exception) { +// if (console) { +// console.log("login fail:" + error); +// console.log(exception); +// } +// } +// }); }; var Login = function () { @@ -70,10 +71,10 @@ var Login = function () { }, messages: { username: { - required: $.i18n.prop('com_zte_ums_ict_login_inputname').replace(/\"/g,'') + required: $.i18n.prop('openo_input_userName').replace(/\"/g,'') }, password: { - required: $.i18n.prop('com_zte_ums_ict_login_inputpwd').replace(/\"/g,'') + required: $.i18n.prop('openo_input_password').replace(/\"/g,'') } }, invalidHandler: function (event, validator) { @@ -182,22 +183,22 @@ var Login = function () { $(document).ready(function() { if (store("remember") == "true") { $("input[name='remember']").attr("checked", "checked"); - $("#inputUserName").val(store("inputUserName")); - $("#inputPassword").val(store("inputPassword")); + $("#openo_input_userName").val(store("openo_input_userName")); + $("#openo_input_password").val(store("openo_input_password")); } }); function saveUserInfo(params) { var rmbcheck = $("input[name='remember']"); if (rmbcheck.attr("checked") == true || rmbcheck.is(':checked')) { - var userName = $("#inputUserName").val(); - var passWord = $("#inputPassword").val(); + var userName = $("#openo_input_userName").val(); + var passWord = $("#openo_input_password").val(); store("remember", "true"); - store("inputUserName", params.username); - store("inputPassword", passWord); + store("openo_input_userName", params.username); + store("openo_input_password", passWord); } else { store.remove("remember"); - store.remove("inputUserName"); - store.remove("inputPassword"); + store.remove("openo_input_userName"); + store.remove("openo_input_password"); } } diff --git a/openo-portal/portal-common/src/main/webapp/common/js/mainpage/ict.main.page.js b/openo-portal/portal-common/src/main/webapp/common/js/mainpage/ict.main.page.js deleted file mode 100644 index 6ccb3e52..00000000 --- a/openo-portal/portal-common/src/main/webapp/common/js/mainpage/ict.main.page.js +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright 2016, CMCC Technologies Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -var initMainPage = function(){ - var modules; - var resConfig; - - var lang = getLanguage(); - var propertiesFileNamePrefix = ""; - //var jsonUrl = "json/main-page-" + lang + ".json"; - //var jsonUrl = mainpagePath; - var jsonUrl = "appRes/json/main-page.json"; - var appResExist = false; - - $.ajax({ - async:false, - "type" : "GET", - url: jsonUrl, - dataType: "json", - "success" : function (res, textStatus, jqXHR) { - resConfig = res; - modules = res.modules; - propertiesFileNamePrefix = res.propertiesFileNamePrefix; - appResExist = true; - }, - "error" : function () { - //alert("Config file load error!"); - } - }); - - if(!appResExist){ - jsonUrl = "json/main-page.json"; - $.ajax({ - async:false, - "type" : "GET", - url: jsonUrl, - dataType: "json", - "success" : function (res, textStatus, jqXHR) { - resConfig = res; - modules = res.modules; - propertiesFileNamePrefix = res.propertiesFileNamePrefix; - }, - "error" : function () { - alert("Config file load error!"); - } - }); - } - - var template = "<div class='brick {image}'>" + - "<a id='{linkId}' href='{url}' class='entranceLink'>" + - "<div class='row'>" + - "<div class='cover contentToggle'>{cover}</div>" + - "<div class='{toolsImage}'></div>" + - "<div class='contentTip contentToggle'>{contentTip}</div>" + - "</div>" + - "</a>" + - "</div>"; - - var templatePic = "<div class='brick {image}'>" + - "<div class='row'>" + - "<div class='cover contentToggle'>{cover}</div>" + - "<div class='{toolsImage}'></div>" + - "<div class='contentTip contentToggle'>{contentTip}</div>" + - "</div>" + - "</div>"; - - for (var i = 0; i < modules.length; ++i) { - - if(!modules[i].background){ - alert("Brick background missed!"); - return; - } - - var temp = ""; - - if(modules[i].linkId){ - temp = template.replace("{linkId}", modules[i].linkId) - .replace("{image}", modules[i].background) - .replace("{toolsImage}", modules[i].toolsImage) - .replace("{url}", modules[i].url) - .replace("{contentTip}", modules[i].contentTip); - }else{ - temp = templatePic.replace("{image}", modules[i].background) - .replace("{url}", modules[i].url) - .replace("{contentTip}", ""); - } - - if(modules[i].cover){ - temp = temp.replace("{cover}", "<span id='" + modules[i].cover + "' name_i18n='com_zte_ums_ict_framework_ui_i18n'></span>"); - }else{ - temp = temp.replace("{cover}",""); - } - - $($(".column")[i % 4]).append(temp); - - } - - - $(function() { - - $("#headerName").html("<img src='" + resConfig.productImage + "' />" ); - - $(".brick").mouseover(function(){ - $(".contentTip", this).fadeTo(1000, 1); - $(".cover", this).fadeOut(1000); - }); - - $(".brick").mouseout(function(){ - $(".contentTip", this).fadeTo(1000, 0); - $(".cover", this).fadeIn(1000); - }); - - //添加模块导航链接 - $("a.entranceLink").click(function(e){ - e.preventDefault(); - if($(this).attr("id") && $(this).attr("id") != "undefined"){ - location.href = "default.html" + "#_" + $(this).attr("id"); - } - }); - - //国际化 - loadPropertiesSideMenu(lang, propertiesFileNamePrefix, "appRes/i18n/" , "com_zte_ums_ict_framework_ui_i18n"); - //loadPropertiesSideMenu(lang, propertiesFileNamePrefix, "i18n/" , "com_zte_ums_ict_framework_ui_i18n"); - loadPropertiesSideMenu(lang, "web-framework-integration-i18n", "i18n/" , "com_zte_ums_ict_framework_ui_i18n"); - }); -}
\ No newline at end of file diff --git a/openo-portal/portal-common/src/main/webapp/common/js/mainpage/load_mainPage.js b/openo-portal/portal-common/src/main/webapp/common/js/mainpage/load_mainPage.js new file mode 100644 index 00000000..05704b56 --- /dev/null +++ b/openo-portal/portal-common/src/main/webapp/common/js/mainpage/load_mainPage.js @@ -0,0 +1,97 @@ +/* + * Copyright 2016, CMCC Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +var initMainPage = function() { + var modules; + var resConfig; + var lang = getLanguage(); + var propertiesFileNamePrefix = ""; + + $.ajax({ + async : false, + "type" : "GET", + url : "json/main-page.json", + dataType : "json", + "success" : function (res, textStatus, jqXHR) { + resConfig = res; + modules = res.modules; + propertiesFileNamePrefix = res.propertiesFileNamePrefix; + }, + error : function () { + } + }); + + var template = "<div class='brick {image}'>" + + "<a id='{linkId}' href='{url}' class='entranceLink'>" + + "<div class='row'>" + + "<div class='cover contentToggle'>{cover}</div>" + + "<div class='{toolsImage}'></div>" + + "<div class='contentTip contentToggle'>{contentTip}</div>" + + "</div>" + + "</a>" + + "</div>"; + + var templatePic = "<div class='brick {image}'>" + + "<div class='row'>" + + "<div class='cover contentToggle'>{cover}</div>" + + "<div class='{toolsImage}'></div>" + + "<div class='contentTip contentToggle'>{contentTip}</div>" + + "</div>" + + "</div>"; + + for (var i = 0; i < modules.length; ++i) { + var temp = ""; + if (modules[i].linkId) { + temp = template.replace("{linkId}", modules[i].linkId) + .replace("{image}", modules[i].background) + .replace("{toolsImage}", modules[i].toolsImage) + .replace("{url}", modules[i].url) + .replace("{contentTip}", modules[i].contentTip); + } else { + temp = templatePic.replace("{image}", modules[i].background) + .replace("{url}", modules[i].url) + .replace("{contentTip}", ""); + } + + if (modules[i].cover) { + temp = temp.replace("{cover}", "<span id='" + modules[i].cover + "' name_i18n='openo_main_page_i18n'></span>"); + } else { + temp = temp.replace("{cover}",""); + } + + $($(".column")[i % 4]).append(temp); + } + + $(function() { + $(".brick").mouseover(function() { + $(".contentTip", this).fadeTo(1000, 1); + $(".cover", this).fadeOut(1000); + }); + + $(".brick").mouseout(function() { + $(".contentTip", this).fadeTo(1000, 0); + $(".cover", this).fadeIn(1000); + }); + + $("a.entranceLink").click(function(e) { + e.preventDefault(); + if ($(this).attr("id") && $(this).attr("id") != "undefined") { + location.href = "default.html" + "#_" + $(this).attr("id"); + } + }); + + loadPropertiesSideMenu(lang, propertiesFileNamePrefix, "i18n/" , "openo_main_page_i18n"); + }); +}
\ No newline at end of file diff --git a/openo-portal/portal-common/src/main/webapp/common/json/main-page.json b/openo-portal/portal-common/src/main/webapp/common/json/main-page.json index 2ff3bfa3..a47832bd 100644 --- a/openo-portal/portal-common/src/main/webapp/common/json/main-page.json +++ b/openo-portal/portal-common/src/main/webapp/common/json/main-page.json @@ -1,62 +1,44 @@ -/* - * Copyright 2016, CMCC Technologies Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -{ +{ "propertiesFileNamePrefix":"web-framework-integration-i18n", - "productName":"Net Numen ICT", - "productImage":"image/integration/openo_logo_white.png", + "productName":"OPEN-O System", "modules":[ { - "cover":"com_zte_ums_ict_framework_main_page_dashboard", + "cover":"org_openo_orchestrator_framework_main_page_service", "background":"skyBlue-mainpage", "toolsImage":"toolsImageBrokenLine", "url":"", - "linkId":"ngict-dashboard-index", + "linkId":"openo-nsoc-template", "contentTip":"" }, { - "cover":"com_zte_ums_ict_framework_main_page_monitor", + "cover":"org_openo_orchestrator_framework_main_page_cloud", "background":"golden-mainpage", "toolsImage":"toolsImageHierachy", "url":"", - "linkId":"ngict-itm-monintor", + "linkId":"openo-roc-vim", "contentTip":"" }, { "cover":"", "background":"manLieONCloud-image", "toolsImage":"", - "url":"http://vnjs.net/www/project/freewall/", + "url":"", "contentTip":"" }, { - "cover":"com_zte_ums_ict_framework_main_page_alarm", + "cover":"org_openo_orchestrator_framework_main_page_orchestrator", "background":"orange-mainpage", "toolsImage":"toolsImageGear", "url":"", - "linkId":"ngict-fm-summary", - + "linkId":"openo-nsoc-vApp", "contentTip":"" }, { - "cover":"com_zte_ums_ict_framework_main_page_performance", + "cover":"org_openo_orchestrator_framework_main_page_monitor", "background":"pinkishRed-mainpage", "toolsImage":"toolsImagePresent", "url":"", - "linkId":"ngict-pm-meatask", - + "linkId":"openo-umc-monitor-setting", "contentTip":"" }, { @@ -67,12 +49,11 @@ "contentTip":"" }, { - "cover":"com_zte_ums_ict_framework_main_page_security", + "cover":"org_openo_orchestrator_framework_main_page_resource", "background":"grassGreen-mainpage", "toolsImage":"toolsImageFile", "url":"", - "linkId":"ngict-sm", - + "linkId":"openo-roc-rs-view-overview", "contentTip":"" }, { @@ -90,28 +71,27 @@ "contentTip":"" }, { - "cover":"com_zte_ums_ict_framework_main_page_log", + "cover":"org_openo_orchestrator_framework_main_page_design", "background":"orange-mainpage", "toolsImage":"toolsImageGear", "url":"", - "linkId":"ngict-log", - + "linkId":"openo-nsoc-model-design", "contentTip":"" }, { - "cover":"com_zte_ums_ict_framework_main_page_system", + "cover":"org_openo_orchestrator_framework_main_page_alarm", "background":"skyBlue-mainpage", "toolsImage":"toolsImageBriefcase", "url":"", - "linkId":"ngict-system", - + "linkId":"openo-umc-monitor-alarm-currentAlarm", "contentTip":"" }, { - "cover":"", - "background":"magicThought-image", - "toolsImage":"", + "cover":"org_openo_orchestrator_framework_main_page_performance", + "background":"pinkishRed-mainpage", + "toolsImage":"toolsImagePresent", "url":"", + "linkId":"openo-umc-monitor-pm-historyQuery", "contentTip":"" } ] diff --git a/openo-portal/portal-common/src/main/webapp/common/login.html b/openo-portal/portal-common/src/main/webapp/common/login.html index c0c8eb43..59aaa89f 100644 --- a/openo-portal/portal-common/src/main/webapp/common/login.html +++ b/openo-portal/portal-common/src/main/webapp/common/login.html @@ -16,7 +16,7 @@ <!DOCTYPE html> <html> <head> - <title id="com_zte_ums_ict_portal_login_title" name_i18n="com_zte_ums_ict_framework_ui_i18n_login"></title> + <title id="openo_login_title" name_i18n="openo_login_i18n_login"></title> <meta charset="utf-8"/> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta content="width=device-width, initial-scale=1.0" name="viewport"/> @@ -66,40 +66,40 @@ $("#pageLoading").fakeLoader({text:"",bgColor:"#1178ee",opacity:'1',spinner:"spinner2",zIndex:99999999}); </script> <div class="logo"> - <img id="com_zte_ums_ict_framework_img_login_logo_white" src="./common/image/integration/openo_logo_white.png" name_img="com_zte_ums_ict_framework_img" style="display:none" alt=""/> + <img id="openo_login_logo_white" src="./common/image/integration/openo_logo_white.png" name_img="openo_login_logo_white_img" style="display:none" alt=""/> </div> <div class="content"> <form class="login-form" method="post" id="fm1" action="./login"> - <h3 class="form-title"><span id="com_zte_ums_ict_portal_login_welcome" name_i18n="com_zte_ums_ict_framework_ui_i18n_login"></span></h3> + <h3 class="form-title"><span id="openo_login_welcome" name_i18n="openo_login_i18n_login"></span></h3> <div class="alert display-hide" id="nameOrpwdError" tipstatus="normal"> <button class="close" data-close="alert" onclick="hidetip('nameOrpwdError');"></button> - <div id="com_zte_ums_ict_portal_login_userPassword" name_i18n="com_zte_ums_ict_framework_ui_i18n_login" style="display:inline"></div> + <div id="openo_login_userPassword" name_i18n="openo_login_i18n_login" style="display:inline"></div> </div> <div class="alert display-hide" id="loginConnError" tipstatus="normal"> <button class="close" data-close="alert" onclick="hidetip('loginConnError');"></button> - <div id="com_zte_ums_ict_portal_login_serv_error" name_i18n="com_zte_ums_ict_framework_ui_i18n_login" style="display:inline"></div> + <div id="openo_login_error" name_i18n="openo_login_i18n_login" style="display:inline"></div> </div> <div class="form-group"> - <label id="com_zte_ums_aos_portal_login_username" name_i18n="com_zte_ums_ict_framework_ui_i18n_login" class="control-label visible-ie8 visible-ie9" i18n-html="com_zte_ums_aos_portal_login_username"></label> + <label id="openo_login_username" name_i18n="openo_login_i18n_login" class="control-label visible-ie8 visible-ie9" i18n-html="openo_login_username"></label> <div class="input-icon"> <i class="fa fa-user"></i> - <input class="form-control placeholder-no-fix" id="inputUserName" type="text" autocomplete="off" name_i18n="com_zte_ums_ict_framework_ui_i18n_login" placeholder="" name="username"/> + <input class="form-control placeholder-no-fix" id="openo_input_userName" type="text" autocomplete="off" name_i18n="openo_login_i18n_login" placeholder="" name="username"/> </div> </div> <div class="form-group"> - <label id="com_zte_ums_aos_portal_login_password" name_i18n="com_zte_ums_ict_framework_ui_i18n_login" class="control-label visible-ie8 visible-ie9" i18n-html="com_zte_ums_aos_portal_login_password"></label> + <label id="openo_login_password" name_i18n="openo_login_i18n_login" class="control-label visible-ie8 visible-ie9" i18n-html="openo_login_password"></label> <div class="input-icon"> <i class="fa fa-lock"></i> - <input class="form-control placeholder-no-fix" id="inputPassword" type="password" autocomplete="off" name_i18n="com_zte_ums_ict_framework_ui_i18n_login" placeholder="" name="password"/> + <input class="form-control placeholder-no-fix" id="openo_input_password" type="password" autocomplete="off" name_i18n="openo_login_i18n_login" placeholder="" name="password"/> </div> </div> <div class="form-actions"> <label class="checkbox"> <input type="checkbox" name="remember" value="1"> - <span id="com_zte_ums_ict_portal_login_rememberMe" name_i18n="com_zte_ums_ict_framework_ui_i18n_login"></span> + <span id="openo_login_rememberMe" name_i18n="openo_login_i18n_login"></span> </label> - <button type="submit" i18n-value="com_zte_ums_aos_portal_login_login" id="submitBtn" class="btn blue pull-right"> - <span id="com_zte_ums_aos_portal_login_login" name_i18n="com_zte_ums_ict_framework_ui_i18n_login"></span> + <button type="submit" i18n-value="openo_login_login" id="submitBtn" class="btn blue pull-right"> + <span id="openo_login_login" name_i18n="openo_login_i18n_login"></span> <i class="m-icon-swapright m-icon-white"></i> </button> </div> @@ -109,10 +109,10 @@ jQuery(document).ready(function() { var lang = getLanguage(); loadi18n_login(lang); - $("#com_zte_ums_ict_framework_img_login_logo_white").css('display','inline'); + $("#openo_login_logo_white").css('display','inline'); Login.init(); - if(store("inputUserName")){ - $("#inputUserName").val(store("inputUserName")); + if(store("openo_input_userName")){ + $("#openo_input_userName").val(store("openo_input_userName")); } $("#pageLoading").setToHide(); }); diff --git a/openo-portal/portal-common/src/main/webapp/common/main-page.html b/openo-portal/portal-common/src/main/webapp/common/main-page.html index e803fedc..6c608c92 100644 --- a/openo-portal/portal-common/src/main/webapp/common/main-page.html +++ b/openo-portal/portal-common/src/main/webapp/common/main-page.html @@ -16,65 +16,41 @@ <!DOCTYPE html> <html> <head> - <title id="com_zte_ums_ict_framework_ui_page_title" name_i18n="com_zte_ums_ict_framework_ui_i18n"></title> + <title id="openo_main_page_title" name_i18n="openo_main_page_i18n"></title> <meta content="text/html; charset=utf-8" http-equiv="content-type"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="description" content="ICT Main Page"/> + <meta name="description" content="OPEN-O Main Page"/> <meta name="keywords" content="javascript, dynamic, grid, layout, jquery plugin, fit zone"/> - <link href="./common/css/style-ict-bootstrap.css" rel="stylesheet" type="text/css"/> - <link href="./common/thirdparty/fakeLoader/fakeLoader.css" rel="stylesheet" type="text/css" /> - <link href="./common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/> - <script type="text/javascript" src="./common/thirdparty/jquery/jquery-1.10.2.min.js"></script> - <script type="text/javascript" src="./common/js/core/const.js"></script> - <script type="text/javascript" src="./common/js/core/hk.min.js"></script> - <script type="text/javascript" src="./common/thirdparty/fakeLoader/fakeLoader.min.js"></script> - <script type="text/javascript" src="./common/js/tools.js"></script> - <script type="text/javascript" src="./common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script> - <script type="text/javascript" src="./common/thirdparty/jquery-cokie/jquery.cokie.min.js"></script> - <script type="text/javascript" src="./common/js/international/loadi18n.js"></script> - <script type="text/javascript" src="./common/js/mainpage/ict.main.page.js"></script> - <script type="text/javascript" src="./common/js/core/pym.min.js"></script> - <script type="text/javascript" src="./common/js/core/openoFrameWork.min.js"></script> - <style type="text/css"> - html, body { - margin: 0; - padding: 0; - } - .layout { - padding-top:0px; - } - body { - font-family: microsoft yahei !important; - background: #484747; - } - .main-page-wrapper { - margin-left: 100px; - margin-right: 100px; - } - .brick .row { - margin-right: 5px; - margin-left: 5px; - margin-top: 10px; - } - .column{ - padding-left: 5px; - padding-right: 5px; - } - a:hover{ - color:white; - } - </style> + <link href="css/style-ict-bootstrap.css" rel="stylesheet" type="text/css"/> + <link href="thirdparty/fakeLoader/fakeLoader.css" rel="stylesheet" type="text/css" /> + <link href="thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/> + <link href="css/main_page.css" rel="stylesheet" type="text/css"/> + <script type="text/javascript" src="thirdparty/jquery/jquery-1.10.2.min.js"></script> + <script type="text/javascript" src="js/core/const.js"></script> + <script type="text/javascript" src="js/core/hk.min.js"></script> + <script type="text/javascript" src="thirdparty/fakeLoader/fakeLoader.min.js"></script> + <script type="text/javascript" src="js/tools.js"></script> + <script type="text/javascript" src="thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script> + <script type="text/javascript" src="thirdparty/jquery-cokie/jquery.cokie.min.js"></script> + <script type="text/javascript" src="js/international/loadi18n.js"></script> + <script type="text/javascript" src="js/mainpage/load_mainPage.js"></script> + <script type="text/javascript" src="js/core/pym.min.js"></script> + <script type="text/javascript" src="js/core/openoFrameWork.min.js"></script> + <script type="text/javascript"> + jQuery(document).ready(function() { + initMainPage(); + $("#pageLoading").setToHide(); + }); + </script> </head> <body> <div id="pageLoading" class="fakeloader"></div> <script type="text/javascript"> - $("#pageLoading").fakeLoader({text:"",bgColor:"#1178ee",opacity:'1',spinner:"spinner2",zIndex:99999999}); + $("#pageLoading").fakeLoader({text:"", bgColor:"#1178ee", opacity:'1', spinner:"spinner2", zIndex:99999999}); </script> <div class='header'> <div class="clearfix"> - <div class="float-left"> - <h2><a id="headerName" href="#">Net Numen</a></h2> - </div> + <div class="float-left"><img src="image/integration/openo_logo_white.png"/></div> </div> </div> <div class="layout" style="overflow:hidden;"> @@ -87,11 +63,5 @@ </div> </div> </div> - <script type="text/javascript"> - jQuery(document).ready(function() { - initMainPage(); - $("#pageLoading").setToHide(); - }); - </script> </body> </html>
\ No newline at end of file |