Commit edf8a2a6 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

синхронизация index.html

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50259 954022d7-b5bf-4e40-9824-e11837661b57
parent bb7b584d
......@@ -100,6 +100,7 @@
<script type="text/javascript" src="../../common/Gateway.js"></script>
<script type="text/javascript" src="../../common/IrregularStack.js"></script>
<script type="text/javascript" src="../../common/main/loader.js"></script>
<script type="text/javascript" src="../../common/main/lib/component/util/MetricSettings.js"></script>
<script type="text/javascript" src="app.js"></script>
<script type="text/javascript" src="../../common/locale.js"></script>
......
......@@ -9,13 +9,13 @@
<link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="../../../3rdparty/extjs/resources/css/ext-all.css">
<script type="text/javascript" src="../../../3rdparty/xregexp/xregexp-all-min.js"></script>
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/header.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/load-mask.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/chat-panel.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/jquery.jscrollpane.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/asc.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/participantspanel.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/searchfield.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/searchdialog.css">
......@@ -55,6 +55,7 @@
min-width:240px;
vertical-align:top;
background-image:url('./resources/img/loading-logo.gif');
background-image: -webkit-image-set(url('./resources/img/loading-logo.gif') 1x, url('./resources/img/loading-logo@2x.gif') 2x);
background-repeat:no-repeat;
}
......@@ -88,6 +89,7 @@
<script type="text/javascript" src="../../../3rdparty/jquery/mousewheel/jquery.mousewheel.js"></script>
<script type="text/javascript" src="../../../3rdparty/jquery/jscrollpane/jquery.jscrollpane.js"></script>
<script type="text/javascript" src="../../../3rdparty/sockjs/sockjs-0.3.min.js"></script>
<script type="text/javascript" src="../../../3rdparty/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../3rdparty/underscore/underscore-min.js"></script>
<!-- Application -->
......@@ -97,6 +99,7 @@
<script type="text/javascript" src="../../common/Gateway.js"></script>
<script type="text/javascript" src="../../common/IrregularStack.js"></script>
<script type="text/javascript" src="../../common/main/loader.js"></script>
<script type="text/javascript" src="../../common/main/lib/component/util/MetricSettings.js"></script>
<script type="text/javascript" src="app.js"></script>
<script type="text/javascript" src="../../common/locale.js"></script>
......@@ -270,11 +273,11 @@
<script type="text/javascript">
var isBrowserSupported = function() {
return !((Ext.isIE6 || Ext.isIE7 || Ext.isIE8) ||
(Ext.isSafari2 || Ext.isSafari3 || Ext.isSafari4) ||
(Ext.isGecko && Ext.firefoxVersion < 4.0) ||
(Ext.isChrome && Ext.chromeVersion < 7.0) ||
(Ext.isOpera && Ext.operaVersion < 10.5));
return !((Ext.ieVersion != 0 && Ext.ieVersion < 9.0) ||
(Ext.safariVersion != 0 && Ext.safariVersion < 5.0) ||
(Ext.firefoxVersion != 0 && Ext.firefoxVersion < 4.0) ||
(Ext.chromeVersion != 0 && Ext.chromeVersion < 7.0) ||
(Ext.operaVersion != 0 && Ext.operaVersion < 10.5));
};
if (!isBrowserSupported()){
......@@ -297,7 +300,7 @@
'../../common/main/resources/css/themecolorpalette.css',
'../../common/main/resources/css/grouped-data-view.css', '../../common/main/resources/css/multislider-gradient.css',
'resources/css/dimension-picker.css', 'resources/css/toolbar.css', '../../common/main/resources/css/dataview-combo.css',
'resources/css/right-panels.css', 'resources/css/advanced-settings-dialog.css'];
'resources/css/right-panels.css', 'resources/css/advanced-settings-dialog.css', '../../common/main/resources/css/synchronize-tip.css'];
};
</script>
......
......@@ -15,6 +15,7 @@
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/chat-panel.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/jquery.jscrollpane.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/asc.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/participantspanel.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/searchfield.css">
<link rel="stylesheet" type="text/css" href="../../common/main/resources/css/searchdialog.css">
......@@ -23,7 +24,6 @@
<link rel="stylesheet" type="text/css" href="resources/css/document-holder.css">
<link rel="stylesheet" type="text/css" href="resources/css/document-statusinfo.css">
<link rel="stylesheet" type="text/css" href="resources/css/main-menu.css">
<link rel="stylesheet" type="text/css" href="resources/css/search.css">
<link rel="stylesheet" type="text/css" href="resources/css/file.css">
<link rel="stylesheet" type="text/css" href="resources/css/file-create-new.css">
<link rel="stylesheet" type="text/css" href="resources/css/file-open-recent.css">
......@@ -71,9 +71,7 @@
</style>
</head>
<body>
<script type="text/javascript">
window.start_time = new Date();
</script>
<div id="loading-mask" class="loadmask">
<div class="loadmask-body" align="center">
<div class="loadmask-logo">
......@@ -89,7 +87,7 @@
<script type="text/javascript" src="../../../3rdparty/jquery/mousewheel/jquery.mousewheel.js"></script>
<script type="text/javascript" src="../../../3rdparty/jquery/jscrollpane/jquery.jscrollpane.js"></script>
<script type="text/javascript" src="../../../3rdparty/sockjs/sockjs-0.3.min.js"></script>
<script type="text/javascript" src="../../../3rdparty/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../3rdparty/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../3rdparty/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/editorscommon.js"></script>
......@@ -227,6 +225,7 @@
<script type="text/javascript" src="../../common/Gateway.js"></script>
<script type="text/javascript" src="../../common/IrregularStack.js"></script>
<script type="text/javascript" src="../../common/main/loader.js"></script>
<script type="text/javascript" src="../../common/main/lib/component/util/MetricSettings.js"></script>
<script type="text/javascript" src="app.js"></script>
<script type="text/javascript" src="../../common/locale.js"></script>
......@@ -234,11 +233,11 @@
<script type="text/javascript">
var isBrowserSupported = function() {
return !((Ext.isIE6 || Ext.isIE7 || Ext.isIE8) ||
(Ext.isSafari2 || Ext.isSafari3 || Ext.isSafari4) ||
(Ext.isGecko && Ext.firefoxVersion < 4.0) ||
(Ext.isChrome && Ext.chromeVersion < 7.0) ||
(Ext.isOpera && Ext.operaVersion < 10.5));
return !((Ext.ieVersion != 0 && Ext.ieVersion < 9.0) ||
(Ext.safariVersion != 0 && Ext.safariVersion < 5.0) ||
(Ext.firefoxVersion != 0 && Ext.firefoxVersion < 4.0) ||
(Ext.chromeVersion != 0 && Ext.chromeVersion < 7.0) ||
(Ext.operaVersion != 0 && Ext.operaVersion < 10.5));
};
if (!isBrowserSupported()){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment