Index: /coldbox/trunk/src/system/dashboard/handlers/ehColdbox.cfc =================================================================== --- /coldbox/trunk/src/system/dashboard/handlers/ehColdbox.cfc (revision 235) +++ /coldbox/trunk/src/system/dashboard/handlers/ehColdbox.cfc (revision 239) @@ -38,4 +38,6 @@ + + @@ -68,4 +70,6 @@ + + @@ -77,13 +81,11 @@ - - - + - - + + @@ -102,16 +104,190 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -151,85 +327,4 @@ - - - - - - - - - ", "all")> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -271,35 +366,5 @@ - - - - - - - - - - - - "> - - - - "> - - - - - - - - - - - - - - - + @@ -503,12 +568,5 @@ - - - - - - - - + @@ -527,71 +585,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Index: /coldbox/trunk/src/system/dashboard/layouts/Layout.Main.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/layouts/Layout.Main.cfm (revision 235) +++ /coldbox/trunk/src/system/dashboard/layouts/Layout.Main.cfm (revision 239) @@ -10,5 +10,5 @@ - + Index: /coldbox/trunk/src/system/dashboard/layouts/Layout.Login.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/layouts/Layout.Login.cfm (revision 226) +++ /coldbox/trunk/src/system/dashboard/layouts/Layout.Login.cfm (revision 239) @@ -10,5 +10,5 @@ - +
Index: /coldbox/trunk/src/system/dashboard/model/fwsettings.cfc =================================================================== --- /coldbox/trunk/src/system/dashboard/model/fwsettings.cfc (revision 226) +++ /coldbox/trunk/src/system/dashboard/model/fwsettings.cfc (revision 239) @@ -1,13 +1,96 @@ + + + + + - + + + + + + + + + + + + + + + var x = 1; + var settingArray = instance.xmlObj.xmlRoot.settings.xmlChildren; + for (x=1; x lte ArrayLen(settingArray); x=x+1){ + if ( Comparenocase(settingArray[x].xmlAttributes.name,"LogFileEncoding") eq 0){ + settingArray[x].xmlAttributes.value = trim(arguments.logFileEncoding); + } + if ( Comparenocase(settingArray[x].xmlAttributes.name,"LogFileBufferSize") eq 0){ + settingArray[x].xmlAttributes.value = trim(arguments.LogFileBufferSize); + } + if ( Comparenocase(settingArray[x].xmlAttributes.name,"LogFileMaxSize") eq 0){ + settingArray[x].xmlAttributes.value = trim(arguments.LogFileMaxSize); + } + } + saveSettings(); + + + + + + + + + var x = 1; + var settingArray = instance.xmlObj.xmlRoot.settings.xmlChildren; + for (x=1; x lte ArrayLen(settingArray); x=x+1){ + if ( Comparenocase(settingArray[x].xmlAttributes.name,"DefaultFileCharacterSet") eq 0){ + settingArray[x].xmlAttributes.value = trim(arguments.DefaultFileCharacterSet); + } + } + saveSettings(); + + + + + + + + + + + + + + + + + + QueryAddRow(instance.qSettings,1); + for (x=1; x lte ArrayLen(xmlSettings); x=x+1){ + QueryAddColumn(instance.qSettings, trim(xmlSettings[x].xmlAttributes.name), "varchar" , ArrayNew(1)); + QuerySetCell(instance.qSettings, trim(xmlSettings[x].xmlAttributes.name), trim(xmlSettings[x].xmlAttributes.value),1); + } + + + + + + + + + + + + + Index: /coldbox/trunk/src/system/dashboard/model/settings.cfc =================================================================== --- /coldbox/trunk/src/system/dashboard/model/settings.cfc (revision 226) +++ /coldbox/trunk/src/system/dashboard/model/settings.cfc (revision 239) @@ -7,5 +7,7 @@ + + @@ -14,4 +16,5 @@ + @@ -30,12 +33,14 @@ - - update instance.qSettings - set proxyflag = , - proxyserver = , - proxyuser = , - proxypassword = , - proxyport = , - + + + + + + + + + + @@ -51,4 +56,5 @@ + @@ -59,10 +65,12 @@ - - update instance.qSettings - set password = - + + + + + + @@ -90,4 +98,16 @@ + + + + + + + + + + + + @@ -116,13 +136,5 @@ - - - - - - - - - + @@ -130,3 +142,29 @@ + + + + + + + + + + + + + for (x=1; x lte ArrayLen(xmlObj.rollovers.section); x=x+1){ + //Loop Through Rollovers + for(j=1; j lte ArrayLen(xmlObj.rollovers.section[x].XMLChildren) ; j=j+1){ + QueryAddRow(instance.qRollovers,1); + QuerySetCell(instance.qRollovers, "pagesection", trim(xmlObj.rollovers.section[x].XMLAttributes.id) ); + QuerySetCell(instance.qRollovers, "rolloverid", trim(xmlObj.rollovers.section[x].xmlChildren[j].xmlAttributes.id) ); + QuerySetCell(instance.qRollovers, "text", trim(xmlObj.rollovers.section[x].xmlChildren[j].xmlText) ); + } + } + + + + + Index: /coldbox/trunk/src/system/dashboard/config/settings.xml.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/config/settings.xml.cfm (revision 226) +++ /coldbox/trunk/src/system/dashboard/config/settings.xml.cfm (revision 239) @@ -1,2 +1,3 @@ + A4F973241182BD1D3BF8EF468162E7F36F5319FDDC33B574BABF380145FEF5347EACB4AAF2531CBD2CC4DE36ABCFF42E @@ -4,8 +5,8 @@ false - - - - + + + + Index: /coldbox/trunk/src/system/dashboard/config/rollovers.xml =================================================================== --- /coldbox/trunk/src/system/dashboard/config/rollovers.xml (revision 239) +++ /coldbox/trunk/src/system/dashboard/config/rollovers.xml (revision 239) @@ -0,0 +1,17 @@ + + +
+ Displays the framework's and system's information + An extensive online resource list where you can find more useful information about ColdBox + Creates the on the fly documentation for the framework's cfc's +
+ +
+ Displays the framework's read only settings + From here you can change the coldbox logging facility's parameters + From here you can change the file encoding to use when using the fileutilities plugin. + Change your dashboard password, securely!! + Change your proxy settings, if needed. +
+ + Index: /coldbox/trunk/src/system/dashboard/config/config.xml.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/config/config.xml.cfm (revision 233) +++ /coldbox/trunk/src/system/dashboard/config/config.xml.cfm (revision 239) @@ -31,4 +31,6 @@ + + Index: /coldbox/trunk/src/system/dashboard/includes/dashboard.js =================================================================== --- /coldbox/trunk/src/system/dashboard/includes/dashboard.js (revision 233) +++ /coldbox/trunk/src/system/dashboard/includes/dashboard.js (revision 239) @@ -7,8 +7,14 @@ //******************************************************************************** function lon(){ - Effect.Appear('myloader',{duration: .2}); + try{ + Effect.Appear('myloader',{duration: .2}); + } + catch(err){null;} } function loff(){ - Effect.Fade('myloader',{duration: .2}); + try{ + Effect.Fade('myloader',{duration: .2}); + } + catch(err){null;} } @@ -44,4 +50,10 @@ } } +function helpon(){ + Effect.BlindDown('helpbox'); +} +function helpoff(){ + Effect.BlindUp('helpbox'); +} //******************************************************************************** //AJAX INTERACTION @@ -59,5 +71,5 @@ function doEvent (e, targetID, params, methodType ) { - parent.topframe.lon(); + parent.topframe.lon(); var pars = "event=" + e + "&"; //Check for Method. @@ -87,6 +99,17 @@ return false; } - - +function framebuster(){ + if ( top != self ) + top.location=self.location; +} +function resetHint(){ + $("sidemenu_help").innerHTML = "Help tips will be shown here. Just rollover the links above and you will get help."; +} +function confirmit(){ + if ( confirm ("Do you want to commit these changes to the framework.") ) + return true; + else + return false; +} //******************************************************************************** Index: /coldbox/trunk/src/system/dashboard/includes/style.css =================================================================== --- /coldbox/trunk/src/system/dashboard/includes/style.css (revision 235) +++ /coldbox/trunk/src/system/dashboard/includes/style.css (revision 239) @@ -5,5 +5,5 @@ padding: 0px; font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; + font-size:10px; height: 100%; } @@ -19,4 +19,6 @@ font-weight:bold; text-decoration:none; + font-style: italic; + font-size: 10px; } a:hover{ @@ -36,5 +38,5 @@ border-top: 1px solid #AAAAAA; border-bottom: 1px solid #dddddd; - font-size:9px; + font-size:10px; } .browserbuttonsbar{ @@ -103,13 +105,4 @@ bottom: 0px; } -.contentboxes_header{ - background: url(../images/contentboxes_header.png) repeat-x; - height: 50px; - clear: both; -} -.contentboxes{ - margin: 20px; - clear: both; -} .contentboxes_title{ margin-left: 20px; @@ -130,7 +123,7 @@ /* SIDE MENU */ .sidemenu{ - position: absolute; + /* position: absolute; right: 0px; - top: 0px; + top: 0px;*/ background: url(../images/sidemenu_bg.png) repeat; height: 100%; @@ -144,5 +137,6 @@ .sidemenu_help{ font-size: 9px; - margin: 8px; + margin: 10px; + height: 30px; } .sidemenu_toolbar{ @@ -180,8 +174,91 @@ } /* CONTENT */ -.content{ - margin: 20px; +#content{ + width: 600px; + height: 100%; + text-align:left; +} +.maincontentbox{ + width: 600px; + border: 1px outset #cccccc; + background: url(../images/contentboxes_footer.png) repeat-x bottom; + margin: 15px; +} +.contentboxes_header{ + background: url(../images/contentboxes_header.png) repeat-x; + height: 50px; +} +.contentboxes{ + margin: 10px; + margin-bottom: 50px; +} +/* HELP DIVS */ +.helpbox{ + width: 350px; + height: 260px; + border: 1px solid #ddd; + background: url(../images/help_footer_bg.gif) #FBFFCD repeat-x bottom; + margin: 15px; + position: relative; + margin: auto; +} +.helpbox_header{ + width: 100%; + background: url(../images/help_titlebar_bg.gif) repeat-x; + height: 30px; + font-weight: bold; +} +.helpbox_header_title{ + padding-top:3px; + padding-left: 10px; +} +.helpbox_message{ + width: 330px; + height: 200px; + overflow: auto; + overflow-x: hidden; + margin-left: 10px; + margin-right: 10px; + margin-bottom: 10px; +} +.helpbox_message ul{ + list-style-image: url(../images/icons/icon_guide_tips.gif); +} +.helpbox_message li{ + margin-left: -15px; + margin-bottom: 10px; + vertical-align: text-top; } /* FORM ELEMENTS */ +.redtext{ + color: red; +} +.tablelisting{ + font-size: 9px; + border-bottom: 1px solid #cccccc; +} +.tablelisting tr:hover { background: #E8F2FE } +.tablelisting th { + text-align: left; + background-color: #F6F6F6; + background-image: url(../images/th_bg.gif); + background-repeat: repeat-x; + color: #000000; + border: 1px solid #7D7D7D; +} +.sort { + background-color: #5DE3FF; + background-image: url(../images/th_sorted_bg.gif); + background-repeat: repeat-x; + border-top: 1px solid #002F93; + border-bottom: 1px solid #0090FF; + color: #000000; + text-align: left; + font-weight: bold; +} +fieldset{ + background-color: #f5f5f5; + border: 1px solid #ddd; +} input[type=button], input[type=submit], input[type=reset] { background: #eee; @@ -201,7 +278,7 @@ color: #999; } -input[type=text], input[type=password], input[type=checkbox], textarea { border: 1px solid #d7d7d7 } -input[type=text], input[type=password], input[type=checkbox] { padding: .20em .3em } -input[type=text]:focus, input[type=password]:focus, textarea:focus, input[type=checkbox]:focus { +input[type=text], input[type=password], input[type=checkbox], textarea, select { font-size:10px; border: 1px solid #d7d7d7 } +input[type=text], input[type=password], input[type=checkbox], select { padding: .20em .3em } +input[type=text]:focus, input[type=password]:focus, textarea:focus, input[type=checkbox]:focus, select:focus { border: 1px solid #886; } Index: /coldbox/trunk/src/system/dashboard/views/settings/vwSettings.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/settings/vwSettings.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/settings/vwSettings.cfm (revision 239) @@ -0,0 +1,57 @@ + + + + + +
+ +
+
  General Settings
+
+ +
+ +

Below you will see all of the framework settings defined in the settings.xml file.

+
+
+ + + + + + + + bgcolor="##f5f5f5"> + + + + +
Setting + Value
#listgetAt(fwSettings.columnList,i)# + #replace(fwsettings[listgetAt(fwSettings.columnList,i)][1], ",", ", ","all")# +
+
+
+ +
+ Index: /coldbox/trunk/src/system/dashboard/views/settings/vwLogFileSettings.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/settings/vwLogFileSettings.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/settings/vwLogFileSettings.cfm (revision 239) @@ -0,0 +1,90 @@ + + + + +
+
+ + + #getPlugin("messagebox").renderit()# + + #getPlugin("messagebox").render()# + + +
+
  Log File Settings
+
+ +
+ +

Below are the ColdBox's logging facility setting parameters. After submitting these settings they will be saved to the + framework's settings.xml file. However, in order for the settings to take effect, you will need to reinitialize your running + applications so the application scope can be refreshed.

+
+
+ + + + + + + + + + + + + + + + + + + + +
SettingValue
+ Log File Encoding + + + +
+ Log File Buffer Size (In Bytes 8000 - 64000) + + Bytes (Ex: 65536, 32768, 16384, 8192) +
+ Log File Maximum Size (In Kbytes) + + KBytes +
+
+
+ +
+ +
+
+
+ Index: /coldbox/trunk/src/system/dashboard/views/settings/vwPassword.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/settings/vwPassword.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/settings/vwPassword.cfm (revision 239) @@ -0,0 +1,75 @@ + + + + +
+
+ + + #getPlugin("messagebox").renderit()# + + #getPlugin("messagebox").render()# + + +
+
  Change Dashboard Password
+
+ +
+ +

Please enter your current and new password(s) in order to change your Dashboard password.

+
+
+ + + + + + + + + + + + + + + + +
+ Current Password + + +
+ New Password + + +
+ Confirm New Password + + +
+
+
+ +
+ +
+
+
+ Index: /coldbox/trunk/src/system/dashboard/views/settings/vwProxySettings.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/settings/vwProxySettings.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/settings/vwProxySettings.cfm (revision 239) @@ -0,0 +1,107 @@ + + + + +
+
+ + + #getPlugin("messagebox").renderit()# + + #getPlugin("messagebox").render()# + + +
+
  Proxy Settings
+
+ +
+ +

Please enter your HTTP proxy configuration settings for your LAN.

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Current Proxy Status: + +
EnabledDisabled +
+ Proxy Enabled: + + +
+ Proxy Server: + + +
+ Proxy Port: + + +
+ Proxy Username: + + +
+ Proxy Password: + + +
+
+
+ +
+ +
+
+
+ Index: /coldbox/trunk/src/system/dashboard/views/settings/vwFileEncodingSettings.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/settings/vwFileEncodingSettings.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/settings/vwFileEncodingSettings.cfm (revision 239) @@ -0,0 +1,69 @@ + + + + +
+
+ + + #getPlugin("messagebox").renderit()# + + #getPlugin("messagebox").render()# + + +
+
  File Encoding Settings
+
+ +
+ +

Below are the ColdBox's file reading and writing encoding settings. You can only select a valid encoding + from the drop down list.

+
+
+ + + + + + + + + + + +
SettingValue
+ File Character Set + + + +
+
+
+ +
+ +
+
+
+ Index: /coldbox/trunk/src/system/dashboard/views/vwSettings.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/vwSettings.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/vwSettings.cfm (revision 239) @@ -0,0 +1,44 @@ + +#renderView("tags/rollovers")# + + + + + + + + + + +
+ +
+ 		+ +
+
+
Settings
+
+ + + + + #renderview("tags/sidemenu_tools")# + +
+ + + Index: /coldbox/trunk/src/system/dashboard/views/home/vwOnlineResources.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/home/vwOnlineResources.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/home/vwOnlineResources.cfm (revision 239) @@ -0,0 +1,83 @@ + + + + + + +
+ +
+
  Online Resources
+
+ +
+ +

The links below are resources for the ColdBox Framework. Please note that you need an internet connection + to get to these links.

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Official Wiki, Guides, etc:Click Here To Open
Official FAQ:Click Here To Open
Online Forums:Click Here To Open
Blog:Click Here To Open
Official Website:Click Here To Open
Author Website:Click Here To Open
Framework Roadmap:Click Here To Open
Framework Bug Reports:Click Here To Open
Latest CFC API Docs:Click Here To Open
Latest Config Schema Docs:Click Here To Open
+
+
+ +
+ Index: /coldbox/trunk/src/system/dashboard/views/home/vwSystemInfo.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/home/vwSystemInfo.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/home/vwSystemInfo.cfm (revision 239) @@ -0,0 +1,164 @@ + + + + +
+ +
+
  System Information
+
+ +
+ +

Welcome to your ColdBox Framework Dashboard Application. From this application you can view your system's information, have access to + online resources, framework cfc documentation, framework settings, application builder, etc. If you want to auto-update your + ColdBox installation, please click on the Update icon.

+
+
+
+ Framework Information +
+ + + + + + + + + + + + + + + + + + +
Framework ID:#getSetting("codename",1)# #getSetting("version",1)# #getSetting("suffix",1)#
Author:#getSetting("author",1)#
Author Website:#getSetting("authorWebsite",1)#
Official Email:#getSetting("AuthorEmail",1)#
+
+
+

+
+ Framework Locations +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Framework Path:
#getSetting("frameworkpath",1)#
Plugins Path:
#getSetting("FrameworkPluginsPath",1)#
Config Schema Path: + +
#getSetting("ConfigFileSchemaLocation",1)#
Install Folder:
+ + #expandPath("/coldbox/install")# + +
Not Found
+ +
Samples Folder: +
+ + #expandPath("/coldbox/samples")# + +
Not Found
+ +
+
+
+

+
+ System Information +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Operating System: #getPlugin("fileutilities").getOSName()#
Inet Host: #getPlugin("fileutilities").getInetHost()#
Host Ip Address: #getPlugin("fileutilities").getipaddress()#
Java Runtime Version: #getPlugin("fileutilities").getJavaRuntime()#
Java Version: #getPlugin("fileutilities").getJavaVersion()#
File Separator: #getSetting("OSFileSeparator",1)#
ColdFusion Engine:#server.ColdFusion.ProductName#
Engine Version:#server.ColdFusion.ProductVersion#
+
+
+
+
+ +
+ Index: /coldbox/trunk/src/system/dashboard/views/home/vwCFCDocs.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/home/vwCFCDocs.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/home/vwCFCDocs.cfm (revision 239) @@ -0,0 +1,45 @@ + + + + + +
+ +
+
  CFC API Documentation
+
+ +
+ This is your current ColdBox Framework CFC Documentation. Use the dropdown below to choose the documentation type:

+ +
+ Documentation Type: + +
+ #getValue("cfcViewer").render()# +
+ +
+ Index: /coldbox/trunk/src/system/dashboard/views/vwHome.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/vwHome.cfm (revision 235) +++ /coldbox/trunk/src/system/dashboard/views/vwHome.cfm (revision 239) @@ -1,53 +1,41 @@ -
- -
-
-
System Information
-
- - -
    -
  • System Information
    • +#renderView("tags/rollovers")# + + + + + + + -
  • Online Resources
    • - - -
  • CFC Documentation
    • -     - -
  • Config Schema Docs
    • - - -
    -
    - -
    - Help will be shown here, such as rollovers on all the links. -
    - -
    - -
    - Print! Print
    +
    + +
    + +
    +     		+ +
    +
    +
    System Information
    -
    - Help Tips! Help
    -
    + + -
    - Logout of the Dashboard - Logout -
    - - - + #renderview("tags/sidemenu_tools")# +
    -
    - -
    + Index: /coldbox/trunk/src/system/dashboard/views/vwLogin.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/vwLogin.cfm (revision 233) +++ /coldbox/trunk/src/system/dashboard/views/vwLogin.cfm (revision 239) @@ -43,5 +43,5 @@
    -
    +
    Index: /coldbox/trunk/src/system/dashboard/views/tags/rollovers.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/tags/rollovers.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/tags/rollovers.cfm (revision 239) @@ -0,0 +1,10 @@ + + + + Index: /coldbox/trunk/src/system/dashboard/views/tags/header.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/tags/header.cfm (revision 233) +++ /coldbox/trunk/src/system/dashboard/views/tags/header.cfm (revision 239) @@ -56,5 +56,4 @@ -
    Index: /coldbox/trunk/src/system/dashboard/views/tags/sidemenu_tools.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/tags/sidemenu_tools.cfm (revision 239) +++ /coldbox/trunk/src/system/dashboard/views/tags/sidemenu_tools.cfm (revision 239) @@ -0,0 +1,29 @@ + +
    +
    + + +
    +Help tips will be shown here. Just rollover the links above and you will get help. +
    + + +
    + +
    + Print! Print
    +
    + +
    + Help Tips! Help
    +
    + +
    + Logout of the Dashboard + Logout +
    +
    +     Index: /ldbox/trunk/src/system/dashboard/views/vwSchemaDocs.cfm =================================================================== --- /coldbox/trunk/src/system/dashboard/views/vwSchemaDocs.cfm (revision 235) +++ (revision ) @@ -1,1 +1,0 @@ -